ISPConfig3 devel
parent: c04e79 | patch | commitdiff
Marius Cramer
2014-04-30 8edabf647814a012307bbf68628e4656ecf89eff
refs
author Marius Cramer <m.cramer@pixcept.de>
Wednesday, April 30, 2014 14:12 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Wednesday, April 30, 2014 14:12 -0400
commit8edabf647814a012307bbf68628e4656ecf89eff
tree 70527516eacf5fc2d0d3b72ae849972436120a09 tree | zip | gz
parent c04e793d51fe34780247f8eda799a7003bb23ed3 view | diff
6ffc751467f34cd14d0636ee02a5888bdd4b7df5 view | diff 
Merge remote-tracking branch 'ispc/master'

Conflicts:
	server/conf/vhost.conf.master
1 files modified
4 ■■■■■ changed files
server/conf/vhost.conf.master 4 ●●●●● diff | view | raw | blame | history