gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2014-01-22 80b5debe90f839a5bf9813a67041a519d559794a

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Wednesday, January 22, 2014 06:21 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Wednesday, January 22, 2014 06:21 -0500
commit	80b5debe90f839a5bf9813a67041a519d559794a
tree	f0334cc15bf8e52c273ad3a16d081a1efca03046 tree \| zip \| gz
parent	30848e21ee386fc5d0e0d2357044d3d6ce0711c5 view \| diff 8133de09d462f8221deefa29ef67877c6676d84d view \| diff

Merge branch 'stable-3.0.5' of /home/git/repositories/pixcept/ispconfig3 into stable-3.0.5

7 files modified

	server/conf/apache_apps.vhost.master	44 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/apache_ispconfig.conf.master	65 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/vhost.conf.master	54 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/system.inc.php	25 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/tpl.inc.php	21 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/apache2_plugin.inc.php	7 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/apps_vhost_plugin.inc.php	39 ●●●●● diff \| view \| raw \| blame \| history