Marius Burkard
2016-03-23 f964bf7e7403578e787ce5519d9e63c074967242
refs
author Marius Burkard <m.burkard@pixcept.de>
Wednesday, March 23, 2016 03:12 -0400
committer Marius Burkard <m.burkard@pixcept.de>
Wednesday, March 23, 2016 03:12 -0400
commitf964bf7e7403578e787ce5519d9e63c074967242
tree 1e64658046b1948ba9f377bba6e4daaa7c2f7999 tree | zip | gz
parent 069b2fea73b3613776af8ced5f20fc1bac269121 view | diff
62f5b704bcf35b25f5fabbadd8faa9d70b0b3fbf view | diff
Merge branch 'stable-3.1'
9 files modified
179 ■■■■ changed files
install/lib/installer_base.lib.php 2 ●●● diff | view | raw | blame | history
install/tpl/nginx_apps.vhost.master 4 ●●●● diff | view | raw | blame | history
install/tpl/nginx_ispconfig.vhost.master 4 ●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/dns/dns_import.php 154 ●●●● diff | view | raw | blame | history
server/conf/nginx_apps.vhost.master 5 ●●●●● diff | view | raw | blame | history
server/conf/php_fpm_pool.conf.master 4 ●●● diff | view | raw | blame | history
server/scripts/update_from_dev.sh 2 ●●● diff | view | raw | blame | history
server/scripts/update_from_dev_stable.sh 2 ●●● diff | view | raw | blame | history