Mailman: merge changes in urls.py
This commit is contained in:
parent
a85f0418eb
commit
a65f6b3035
1 changed files with 2 additions and 1 deletions
|
@ -3,7 +3,7 @@
|
||||||
import hyperkitty
|
import hyperkitty
|
||||||
import postorius
|
import postorius
|
||||||
|
|
||||||
from django.conf.urls.defaults import *
|
from django.conf.urls import patterns, include, url
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
# Uncomment the next two lines to enable the admin:
|
# Uncomment the next two lines to enable the admin:
|
||||||
|
@ -24,4 +24,5 @@ urlpatterns = patterns('',
|
||||||
url(r'^admin/', include('postorius.urls')),
|
url(r'^admin/', include('postorius.urls')),
|
||||||
url(r'^archives/', include('hyperkitty.urls')),
|
url(r'^archives/', include('hyperkitty.urls')),
|
||||||
url(r'', include('social_auth.urls')),
|
url(r'', include('social_auth.urls')),
|
||||||
|
url(r'', include('django_browserid.urls')),
|
||||||
)
|
)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue