Commit 859535af authored by Guillaume Pellerin's avatar Guillaume Pellerin
Browse files

Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev

parents 1ad8a840 a50b36ce
......@@ -333,7 +333,7 @@ TEMPLATES = [{
'organization.core.context_processors.organization_settings',
),
'loaders': [
'mezzanine.template.loaders.host_themes.Loader',
#'mezzanine.template.loaders.host_themes.Loader',
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
],
......
......@@ -43,7 +43,7 @@ db:
- POSTGRES_PASSWORD=noodFof2Kna
app:
image: ircamweb/mezzo
image: ircamweb/mezzo:latest-dev
command: /bin/sh bin/app.sh --runserver
volumes:
- ./app:/srv/app
......
Subproject commit d511717a83690663f0184b7bce417ed06f4b39d6
Subproject commit e30ab1270da5993a06037745a8a3496fb45e7bc0
Supports Markdown
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