mravi/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 16:18:37 -05:00
commit 34fcb403c7
309 changed files with 62025 additions and 3871 deletions
Download patch file Download diff file Expand all files Collapse all files

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'^',include('ungleich_page.urls',namespace='ungleich_page'),name='ungleich_page'),
url(r'^', include('cms.urls')),
)