Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git://github.com/stefanfoulis/django-cms-2.0

  • Loading branch information...
commit ff2f0e0208c515933ff873ac13a93982e425a7f8 2 parents 3f37ce1 + d3b9816
@digi604 digi604 authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  cms/__init__.py
View
2  cms/__init__.py
@@ -2,8 +2,8 @@
__version__ = '.'.join(map(str, VERSION))
# patch settings
-from conf import patch_settings
try:
+ from conf import patch_settings
from django.conf import settings
patch_settings()
except ImportError:
Please sign in to comment.
Something went wrong with that request. Please try again.