gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2014-10-24 5ec4395f0e23bf11b3edef5c745e8f38c73ce637

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Friday, October 24, 2014 09:33 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Friday, October 24, 2014 09:33 -0400
commit	5ec4395f0e23bf11b3edef5c745e8f38c73ce637
tree	e31d8b0e9ab7911c776c80afa78d9f8a7415d1b1 tree \| zip \| gz
parent	7972151d0448b99e0ba28c819a698757c27c1d55 view \| diff 67fedede3887d97078862e9b58524dc71162ba24 view \| diff

Merge branch 'stable-3.0.5'

Conflicts:
	install/dist/lib/fedora.lib.php
	install/dist/lib/opensuse.lib.php

4 files modified

2 files added

	install/dist/conf/centos70.conf.php	219 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/lib/centos70.lib.php	164 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/lib/debian60.lib.php	11 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/lib/fedora.lib.php	9 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/install.lib.php	2 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/installer_base.lib.php	11 ●●●●● diff \| view \| raw \| blame \| history