aatish/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/vm_pricing

Browse source
This commit is contained in:
Levi 2016-04-24 19:20:17 -05:00
commit f5978a7da9
6 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dynamicweb/settings/base.py
View file

@ -54,7 +54,6 @@ INSTALLED_APPS = (
'django.contrib.sites',
'easy_thumbnails',
'utils',
'ungleich_page',
'mptt',
'parler',
'taggit',
@ -104,6 +103,7 @@ INSTALLED_APPS = (
'reversion',
# ungleich
'ungleich',
'ungleich_page',
'hosting',
'digitalglarus',
'django_extensions',

2
dynamicweb/urls.py
View file

@ -28,7 +28,7 @@ urlpatterns += i18n_patterns('',
url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus"),name='digitalglarus'),
url(r'^blog/',include('ungleich.urls',namespace='ungleich')),
url(r'^',include('ungleich_page.urls',namespace='ungleich_page'),name='ungleich_page'),
url(r'^ungleich_page/',include('ungleich_page.urls',namespace='ungleich_page'),name='ungleich_page'),
url(r'^', include('cms.urls')),
)