Marius Burkard
2016-02-11 486e424dfd1c57c4b4fef5c01319aca6d53cd7cf
refs
author Marius Burkard <m.burkard@pixcept.de>
Thursday, February 11, 2016 13:14 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Thursday, February 11, 2016 13:14 -0500
commit486e424dfd1c57c4b4fef5c01319aca6d53cd7cf
tree b7aeec01370e9cb4eb0389690aa0283824fdd142 tree | zip | gz
parent 0e8c9aeef967fd3437d3d1a8df917724d4bebf0f view | diff
606949b364f28025d98074c89ba6b03f2a556440 view | diff
Merge branch 'stable-3.1'
1 files renamed
4 files modified
13 ■■■■■ changed files
install/tpl/apache_ispconfig.conf.master 7 ●●●● diff | view | raw | blame | history
interface/acme/.well-known/acme-challenge/empty.dir diff | view | raw | blame | history
server/conf/nginx_vhost.conf.master 2 ●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 2 ●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 2 ●●● diff | view | raw | blame | history