diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2014-07-02 09:20:40 +0000 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2014-07-02 09:20:40 +0000 |
| commit | a65f6b303573e1fa9ec38f4aa0e86be66365a189 (patch) | |
| tree | 110af8807efe164363bf266ab76431e04ac0691a | |
| parent | a85f0418eb55d1cdedf8889cc8070b48807c7168 (diff) | |
| download | ansible-a65f6b303573e1fa9ec38f4aa0e86be66365a189.tar.gz ansible-a65f6b303573e1fa9ec38f4aa0e86be66365a189.tar.xz ansible-a65f6b303573e1fa9ec38f4aa0e86be66365a189.zip | |
Mailman: merge changes in urls.py
| -rw-r--r-- | roles/mailman/files/urls.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/mailman/files/urls.py b/roles/mailman/files/urls.py index bc4f931fc..3717bfd26 100644 --- a/roles/mailman/files/urls.py +++ b/roles/mailman/files/urls.py @@ -3,7 +3,7 @@ import hyperkitty import postorius -from django.conf.urls.defaults import * +from django.conf.urls import patterns, include, url from django.conf import settings # Uncomment the next two lines to enable the admin: @@ -24,4 +24,5 @@ urlpatterns = patterns('', url(r'^admin/', include('postorius.urls')), url(r'^archives/', include('hyperkitty.urls')), url(r'', include('social_auth.urls')), + url(r'', include('django_browserid.urls')), ) |