Skip to content
Commit 8ddcb0d7 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/sites/web_vhost_subdomain_edit.php
	server/plugins-available/cron_plugin.inc.php
parents 05481a4f c9262595
Hide whitespace changes
Inline Side-by-side
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