Merge branch 'master' into nextcloud11

This commit is contained in:
yodax
2017-05-24 10:06:06 +02:00
3 changed files with 8 additions and 5 deletions
+3
View File
@@ -1,6 +1,9 @@
# Control Panel
# Proxy /admin to our Python based control panel daemon. It is
# listening on IPv4 only so use an IP address and not 'localhost'.
location /admin/assets {
alias /usr/local/lib/mailinabox/vendor/assets;
}
rewrite ^/admin$ /admin/;
rewrite ^/admin/munin$ /admin/munin/ redirect;
location /admin/ {