Commit f8d2fdbd authored by Aegir user's avatar Aegir user

Merge branch 'master' of https://github.com/civicrm/civicrm-org-site

Merge to resolve push error via BGM
parents 23d6656b fdfaea39
......@@ -11,6 +11,12 @@ rewrite ^/get-buildkit.sh$ https://raw.githubusercontent.com/civicrm/civicrm-bui
rewrite ^/blogs/(.*)$ /blog/$1 permanent;
# Enable access to files/civicrm/custom/images/
location ~* ^/sites/civicrm.org/files/civicrm/custom/image {
access_log off;
try_files $uri =404;
}
# For compatibility with pre/post Aegir
# nb: eventually add 'permanent' redirect?
rewrite ^/sites/all/themes/(.*)$ /sites/$host/themes/$1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment