gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Till Brehm

2014-02-18 10b13b85657e7f87333eef5360026e77d6319d80

refs
author	Till Brehm <tbrehm@ispconfig.org>
	Tuesday, February 18, 2014 08:53 -0500
committer	Till Brehm <tbrehm@ispconfig.org>
	Tuesday, February 18, 2014 08:53 -0500
commit	10b13b85657e7f87333eef5360026e77d6319d80
tree	b1d57f9c04f042b66479d1315db4ac34da46b677 tree \| zip \| gz
parent	1af70cf186aa9650e86462d9db1c0bf840b9e293 view \| diff 7b699b698736ef931c656dcf4090e53fee846861 view \| diff

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

10 files modified

1 files added

	install/dist/lib/opensuse.lib.php	2 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/tpl/gentoo/apache_apps.vhost.master	4 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/tpl/gentoo/apache_ispconfig.vhost.master	4 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/incremental/upd_0068.sql	7 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/incremental/upd_0069.sql	1 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	1 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/apache_apps.vhost.master	4 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/apache_ispconfig.vhost.master	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/remoting.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/apache_apps.vhost.master	2 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/vhost.conf.master	4 ●●●●● diff \| view \| raw \| blame \| history