gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Till Brehm

2013-11-20 d04604ab1a8c0179cb4464acff4b7dc4a4877504

refs
author	Till Brehm <tbrehm@ispconfig.org>
	Wednesday, November 20, 2013 13:50 -0500
committer	Till Brehm <tbrehm@ispconfig.org>
	Wednesday, November 20, 2013 13:50 -0500
commit	d04604ab1a8c0179cb4464acff4b7dc4a4877504
tree	fb4050387cb0ef0a0b624ae195f547e5f71ceffd tree \| zip \| gz
parent	6a8a67f05081001851bbd70644188263132c5921 view \| diff f386c610180e7864d002a42667f3eb973c749ece view \| diff

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

12 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	21 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/session.inc.php	18 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/system_config.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/de_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_system_config.lng	1 ●●●●● 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	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/login/lib/lang/de.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/login/lib/lang/en.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/login/templates/index.htm	10 ●●●●● diff \| view \| raw \| blame \| history