Merge pull request #36 from levivm/develop

fixed login urls
This commit is contained in:
Levi Velázquez 2016-04-15 22:58:07 -05:00
commit 7c29726166

View file

@ -20,12 +20,13 @@ urlpatterns = [
urlpatterns += i18n_patterns('', urlpatterns += i18n_patterns('',
# url(r'^$',include('ungleich.urls')), # url(r'^$',include('ungleich.urls')),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^login/',include(membership_urls)),
url(r'^digitalglarus/', include('digitalglarus.urls', url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus"),name='digitalglarus'), namespace="digitalglarus"),name='digitalglarus'),
url(r'^blog/',include('ungleich.urls',namespace='ungleich')), 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'^login/',include(membership_urls)),
url(r'^', include('cms.urls')), url(r'^', include('cms.urls')),
) )