Skip to content
Commit 82b723df authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge remote-tracking branch 'origin/stable-3.0.5'

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
parents 35b30fa7 a80ae199
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment