ISPConfig3 devel
parent: 6b1fde | patch | commitdiff
Marius Cramer
2015-05-21 985390fdb8ba94cbcf7312e32a484396c3d49702
refs
author Marius Cramer <m.cramer@pixcept.de>
Thursday, May 21, 2015 04:19 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Thursday, May 21, 2015 04:19 -0400
commit985390fdb8ba94cbcf7312e32a484396c3d49702
tree 846adc02c2b8c8a0ce9dc88b73e228be86ee8225 tree | zip | gz
parent 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f view | diff
582cbf7bde9cb4b0a881e10ed2ffed92dcbc1f8d view | diff 
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
2 files modified
70 ■■■■■ changed files
interface/lib/classes/tform_base.inc.php 66 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/tabbed_form.tpl.htm 4 ●●●●● diff | view | raw | blame | history