Marius Burkard
2016-02-11 14c2d8c290345fc338a4990352f720d9d4811361
refs
author Marius Burkard <m.burkard@pixcept.de>
Thursday, February 11, 2016 12:04 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Thursday, February 11, 2016 12:04 -0500
commit14c2d8c290345fc338a4990352f720d9d4811361
tree 725df4a1debe4d36fde3312e9e835feb96f473bd tree | zip | gz
parent 88c307b0ef30a94ea5e9b52a1f9078bf04033d29 view | diff
7456a4f509267556c92ef1b0cff74c9be2c9453b view | diff
Merge branch 'stable-3.1'
1 files added
5 files modified
88 ■■■■■ changed files
install/tpl/apache_ispconfig.conf.master 2 ●●●●● diff | view | raw | blame | history
interface/acme-challenge/empty.dir 1 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/module.conf.php 5 ●●●●● diff | view | raw | blame | history
server/conf/nginx_vhost.conf.master 14 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 29 ●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 37 ●●●● diff | view | raw | blame | history