Marius Burkard
2016-02-11 a7796bec1be01b51f400e9a3a698535b12b636aa
refs
author Marius Burkard <m.burkard@pixcept.de>
Thursday, February 11, 2016 13:44 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Thursday, February 11, 2016 13:44 -0500
commita7796bec1be01b51f400e9a3a698535b12b636aa
tree 26bcbdd3123a3f2285a01ec52a70ce3360db7d34 tree | zip | gz
parent 486e424dfd1c57c4b4fef5c01319aca6d53cd7cf view | diff
8831af7f89bf4746fbbad8aa4aa700f6567d9dae view | diff
Merge branch 'stable-3.1'
2 files modified
10 ■■■■ changed files
install/tpl/apache_ispconfig.conf.master 6 ●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 4 ●●●● diff | view | raw | blame | history