Till Brehm
2014-06-06 efbb88feee52d96ca266485ea2e9d79ce54ff39a
refs
author Till Brehm <tbrehm@ispconfig.org>
Friday, June 6, 2014 10:41 -0400
committer Till Brehm <tbrehm@ispconfig.org>
Friday, June 6, 2014 10:41 -0400
commitefbb88feee52d96ca266485ea2e9d79ce54ff39a
tree 4697bc4561733bd8346193dc4284d9e507c1e686 tree | zip | gz
parent c71d48f6593a35abf71e9dae97dd7a56499f20d9 view | diff
5a6670bd3c1083f3c6f6652202e7c776745b5eff view | diff
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
3 files modified
17 ■■■■■ changed files
install/tpl/apache_ispconfig.conf.master 1 ●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 14 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 2 ●●● diff | view | raw | blame | history