Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
Showing
- helper_scripts/mydns_to_powerdns_migration.php 18 additions, 1 deletionhelper_scripts/mydns_to_powerdns_migration.php
- install/dist/lib/centos_base.lib.php 7 additions, 0 deletionsinstall/dist/lib/centos_base.lib.php
- install/lib/install.lib.php 3 additions, 1 deletioninstall/lib/install.lib.php
- interface/web/mail/xmpp_domain_edit.php 1 addition, 1 deletioninterface/web/mail/xmpp_domain_edit.php
- server/conf/nginx_vhost.conf.master 2 additions, 0 deletionsserver/conf/nginx_vhost.conf.master
- server/conf/php-fcgi-starter.master 0 additions, 2 deletionsserver/conf/php-fcgi-starter.master
- server/conf/vhost.conf.master 4 additions, 4 deletionsserver/conf/vhost.conf.master
- server/plugins-available/apache2_plugin.inc.php 5 additions, 1 deletionserver/plugins-available/apache2_plugin.inc.php
- server/plugins-available/mysql_clientdb_plugin.inc.php 6 additions, 3 deletionsserver/plugins-available/mysql_clientdb_plugin.inc.php
Loading
Please register or sign in to comment