From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 7 Nov 2016 15:40:35 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8cb861bfed3fb9e2360efbfe9b47b8240f2c9b76;p=mezzo.git

Merge branch 'dev'

Conflicts:
	app/settings.py
---

8cb861bfed3fb9e2360efbfe9b47b8240f2c9b76
diff --cc app/settings.py
index f5bed651,ab506770..e4891ac2
--- a/app/settings.py
+++ b/app/settings.py
@@@ -271,14 -271,8 +271,15 @@@ TEMPLATES = [{'APP_DIRS': False
                                                    'django.core.context_processors.request',
                                                    'django.core.context_processors.tz',
                                                    'mezzanine.conf.context_processors.settings',
-                                                   'mezzanine.pages.context_processors.page'),
+                                                   'mezzanine.pages.context_processors.page',
 -                                                  'organization.core.context_processors.static')}}]
++                                                  'organization.core.context_processors.static'),
 +                            'loaders': [
 +                                ('django.template.loaders.cached.Loader', [
 +                                    'django.template.loaders.filesystem.Loader',
 +                                    'django.template.loaders.app_directories.Loader',
 +                                ]),],
 +                          },
 +            }]
  
  # List of middleware classes to use. Order is important; in the request phase,
  # these middleware classes will be applied in the order given, and in the