Marius Burkard
2016-02-20 c74c6544590c2089494607f5c75592847c1e2e21
refs
author Marius Burkard <m.burkard@pixcept.de>
Saturday, February 20, 2016 03:58 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Saturday, February 20, 2016 03:58 -0500
commitc74c6544590c2089494607f5c75592847c1e2e21
tree 6b75222b5a74588189a204554e02cb86f6a8145b tree | zip | gz
parent 51c155ab6f8c0eb1ea4ad75aaba6f6e1cecc3885 view | diff
4fa79cf8ca10398f45aa30581b56d43d1738b08a view | diff
Merge branch 'stable-3.1'
1 files modified
2 ■■■ changed files
server/conf/vhost.conf.master 2 ●●● diff | view | raw | blame | history