Merge branch 'develop' of git-ungleich:dynamicweb into develop
This commit is contained in:
commit
81207b8e12
106 changed files with 189 additions and 473 deletions
|
|
@ -12,6 +12,7 @@ urlpatterns = [
|
|||
namespace="digitalglarus")),
|
||||
url(r'^railshosting/', include('railshosting.urls',
|
||||
namespace="railshosting")),
|
||||
url(r'^hosting/', include('hosting.urls', namespace="hosting")),
|
||||
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
|
||||
url(r'^jsi18n/(?P<packages>\S+?)/$', 'django.views.i18n.javascript_catalog'),
|
||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue