Skip to content
  • Marius Cramer's avatar
    Merge remote-tracking branch 'origin/stable-3.0.5' · 82b723df
    Marius Cramer authored
    Conflicts:
    	interface/lib/classes/remoting.inc.php
    	interface/web/dns/lib/lang/cz_dns_dkim.lng
    	interface/web/mail/lib/lang/cz_mail_backup_list.lng
    	interface/web/mail/lib/lang/cz_mail_user.lng
    	interface/web/sites/lib/lang/cz_web_childdomain.lng
    	interface/web/sites/lib/lang/cz_web_childdomain_list.lng
    	interface/web/sites/lib/lang/cz_web_subdomain_list.lng
    	interface/web/sites/lib/lang/cz_web_vhost_domain.lng
    	interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
    	interface/web/sites/web_vhost_domain_edit.php
    82b723df