Merge branch 'develop' into 'develop'
# Conflicts: # interface/web/login/index.php
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 2 additions, 2 deletions.gitlab-ci.yml
- install/dist/tpl/gentoo/apache_ispconfig.vhost.master 1 addition, 1 deletioninstall/dist/tpl/gentoo/apache_ispconfig.vhost.master
- install/lib/installer_base.lib.php 24 additions, 5 deletionsinstall/lib/installer_base.lib.php
- install/tpl/apache_apps.vhost.master 1 addition, 134 deletionsinstall/tpl/apache_apps.vhost.master
- install/tpl/apache_apps.vhost.master 1 addition, 134 deletionsinstall/tpl/apache_apps.vhost.master
- install/tpl/server.ini.master 1 addition, 0 deletionsinstall/tpl/server.ini.master
- interface/web/admin/form/server_config.tform.php 14 additions, 0 deletionsinterface/web/admin/form/server_config.tform.php
- interface/web/admin/form/users.tform.php 1 addition, 1 deletioninterface/web/admin/form/users.tform.php
- interface/web/admin/lib/lang/en_server_config.lng 3 additions, 0 deletionsinterface/web/admin/lib/lang/en_server_config.lng
- interface/web/admin/templates/server_config_dns_edit.htm 3 additions, 0 deletionsinterface/web/admin/templates/server_config_dns_edit.htm
- interface/web/client/form/client.tform.php 1 addition, 1 deletioninterface/web/client/form/client.tform.php
- interface/web/login/index.php 1 addition, 1 deletioninterface/web/login/index.php
- server/conf/apache_apps.vhost.master 9 additions, 5 deletionsserver/conf/apache_apps.vhost.master
- server/conf/apps_php_fpm_pool.conf.master 4 additions, 1 deletionserver/conf/apps_php_fpm_pool.conf.master
- server/conf/vhost.conf.master 14 additions, 0 deletionsserver/conf/vhost.conf.master
- server/lib/classes/letsencrypt.inc.php 1 addition, 1 deletionserver/lib/classes/letsencrypt.inc.php
- server/plugins-available/bind_plugin.inc.php 17 additions, 17 deletionsserver/plugins-available/bind_plugin.inc.php
Loading
Please register or sign in to comment