Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: install/sql/ispconfig3.sql install/tpl/config.inc.php.master interface/lib/config.inc.php interface/web/sites/lib/lang/cz_web_subdomain.lng interface/web/sites/lib/lang/cz_web_subdomain_list.lng interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng server/cron_daily.php
Please register or sign in to comment