gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Till Brehm

2013-11-20 5a35aa4ace4b018d23dd9644df74651c8f03a75e

refs
author	Till Brehm <tbrehm@ispconfig.org>
	Wednesday, November 20, 2013 13:08 -0500
committer	Till Brehm <tbrehm@ispconfig.org>
	Wednesday, November 20, 2013 13:08 -0500
commit	5a35aa4ace4b018d23dd9644df74651c8f03a75e
tree	8ddfd27b667972838ee38f99878b316b4001cf4e tree \| zip \| gz
parent	3d96c53b303cfd720a44ad6f825eb94f7c4a3ca3 view \| diff a2d57211a0cffc6e40c5da2cd43e72e4cd5c12ed view \| diff

Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

10 files modified

	install/sql/ispconfig3.sql	1 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/system.ini.master	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/app.inc.php	10 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/session.inc.php	32 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/system_config.tform.php	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/de_system_config.lng	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/system_config_edit.php	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/system_config_misc_edit.htm	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/login/index.php	3 ●●●●● diff \| view \| raw \| blame \| history