Skip to content
Commit 363ccfed authored by Marius Cramer's avatar Marius Cramer
Browse files

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
parents add2800a a246ffd7
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