Skip to content
Commit 985390fd authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'stable-3.0.5' 

Conflicts:
	interface/lib/classes/tform.inc.php
	interface/web/monitor/show_sys_state.php
	interface/web/themes/default/templates/tabbed_form.tpl.htm
parents 6b1fde7e 582cbf7b
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