Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
Showing
- install/lib/installer_base.lib.php 1 addition, 1 deletioninstall/lib/installer_base.lib.php
- interface/lib/classes/db_mysql.inc.php 1 addition, 1 deletioninterface/lib/classes/db_mysql.inc.php
- interface/lib/classes/remote.d/client.inc.php 1 addition, 4 deletionsinterface/lib/classes/remote.d/client.inc.php
- interface/lib/classes/remote.d/dns.inc.php 32 additions, 1 deletioninterface/lib/classes/remote.d/dns.inc.php
- interface/web/admin/system_config_edit.php 4 additions, 0 deletionsinterface/web/admin/system_config_edit.php
- interface/web/client/templates/client_edit_limits.htm 3 additions, 3 deletionsinterface/web/client/templates/client_edit_limits.htm
- interface/web/dashboard/dashboard.php 2 additions, 2 deletionsinterface/web/dashboard/dashboard.php
- interface/web/sites/ajax_get_ip.php 1 addition, 1 deletioninterface/web/sites/ajax_get_ip.php
- interface/web/themes/default/assets/javascripts/ispconfig.js 3 additions, 3 deletionsinterface/web/themes/default/assets/javascripts/ispconfig.js
- server/conf/php_fpm_pool.conf.master 2 additions, 2 deletionsserver/conf/php_fpm_pool.conf.master
- server/cron.php 6 additions, 6 deletionsserver/cron.php
- server/lib/classes/cronjob.inc.php 17 additions, 16 deletionsserver/lib/classes/cronjob.inc.php
- server/plugins-available/apache2_plugin.inc.php 11 additions, 2 deletionsserver/plugins-available/apache2_plugin.inc.php
- server/plugins-available/firewall_plugin.inc.php 1 addition, 1 deletionserver/plugins-available/firewall_plugin.inc.php
- server/plugins-available/nginx_plugin.inc.php 3 additions, 1 deletionserver/plugins-available/nginx_plugin.inc.php
Loading
Please register or sign in to comment