Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php interface/web/mail/lib/lang/de_mail_get.lng interface/web/sites/lib/lang/de_cron.lng interface/web/sites/lib/lang/en_cron.lng interface/web/sites/web_vhost_subdomain_edit.php
Please register or sign in to comment