Marius Burkard
2016-02-11 dfadc85817ae71a7a9bff48ae74bb7293df0d58e
refs
author Marius Burkard <m.burkard@pixcept.de>
Thursday, February 11, 2016 14:04 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Thursday, February 11, 2016 14:04 -0500
commitdfadc85817ae71a7a9bff48ae74bb7293df0d58e
tree b56e4ae813763c7d5b95dcc9e3adb27a1816a79e tree | zip | gz
parent a7796bec1be01b51f400e9a3a698535b12b636aa view | diff
3a5909cd9f21ae517c850edd0ec0401d012f529f view | diff
Merge branch 'stable-3.1'
2 files modified
8 ■■■■■ changed files
install/tpl/apache_ispconfig.conf.master 3 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 5 ●●●●● diff | view | raw | blame | history