Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: interface/lib/classes/tform.inc.php interface/web/admin/lib/lang/de_directive_snippets.lng interface/web/dns/dns_import.php interface/web/dns/dns_soa_edit.php interface/web/dns/dns_wizard.php interface/web/mail/mail_domain_edit.php interface/web/sites/database_edit.php interface/web/sites/lib/lang/de_web_domain.lng interface/web/sites/lib/lang/en_web_domain.lng interface/web/sites/web_domain_edit.php server/server.php
Please register or sign in to comment