diff --git a/colab/settings.py b/colab/settings.py index 77eb8d3..ad20835 100644 --- a/colab/settings.py +++ b/colab/settings.py @@ -279,7 +279,7 @@ CONVERSEJS_SHOW_ONLY_ONLINE_USERS = True # Tastypie settings TASTYPIE_DEFAULT_FORMATS = ['json', ] -from .utils.conf import load_colab_apps +from .utils.conf import load_colab_apps, load_py_settings if locals().get('RAVEN_DSN', False): RAVEN_CONFIG = { @@ -291,6 +291,7 @@ BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False locals().update(load_colab_apps()) +locals().update(load_py_settings()) COLAB_APPS = locals().get('COLAB_APPS') or {} PROXIED_APPS = {} -- libgit2 0.21.2