Merge pull request #161 from levivm/feature/new_digitalglarus

Feature/new digitalglarus
This commit is contained in:
Levi Velázquez 2017-01-10 20:13:02 -05:00 committed by GitHub
commit 64150650eb
17 changed files with 837 additions and 46 deletions

View file

@ -17,7 +17,6 @@ urlpatterns = [ url(r'^index.html$', LandingView.as_view()),
url(r'^nodehosting/', NodeJSHostingView.as_view(), name="node.hosting"),
url(r'^djangohosting/', DjangoHostingView.as_view(), name="django.hosting"),
url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")),
url(r'^datacenterlight', include('datacenterlight.urls', namespace="datacenterlight")),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
url(r'^jsi18n/(?P<packages>\S+?)/$',
'django.views.i18n.javascript_catalog'),
@ -27,6 +26,7 @@ urlpatterns = [ url(r'^index.html$', LandingView.as_view()),
urlpatterns += i18n_patterns('',
url(r'^/?$', LandingView.as_view()),
url(r'^admin/', include(admin.site.urls)),
url(r'^datacenterlight', include('datacenterlight.urls', namespace="datacenterlight")),
url(r'^membership/', include(membership_urls)),
url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus")),