Skip to content
Commit 9893e01f 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
	server/cron_daily.php
parents bca1af51 e20f18f3
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