From: Raphael Voyazopoulos <raphael.voyazopoulos@ircam.fr>
Date: Fri, 30 Mar 2018 15:07:35 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Ircam-Web/Mezzo
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a6427b764c083e3d370b79a6a43dfe3d0ff3d94b;p=mezzo.git

Merge branch 'master' of https://github.com/Ircam-Web/Mezzo
---

a6427b764c083e3d370b79a6a43dfe3d0ff3d94b
diff --cc app/settings.py
index 63642e66,ecc45e42..e8be1327
--- a/app/settings.py
+++ b/app/settings.py
@@@ -286,9 -286,17 +287,17 @@@ INSTALLED_APPS = 
      'extra_views',
  ]
  
+ CUSTOM_MODULES = False
+ 
+ if CUSTOM_MODULES:
+     INSTALLED_APPS += [
+         "organization.custom",
+     ]
+ 
+ 
  
  HOST_THEMES = [
 -    ('example.com', 'organization_themes.ircam-www-theme'),
 +    ('example.com', 'organization_themes.forumnet-theme'),
  ]
  
  BOWER_COMPONENTS_ROOT = '/srv/bower/'