Merge remote-tracking branch 'origin/master'

dgrant · Mar 7, 2014 · e7d3b20 · e7d3b20
2 parents ec7326c + 7e8bfb3
commit e7d3b20
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/links/urls.py b/links/urls.py
@@ -11,5 +11,5 @@
     url(r'^browse/$', Browse.as_view(), name='browse'),
     url(r'^browse/category/(?P<category_slug>\S+)/$', Browse.as_view(), name='browse_category'),
 
-    url(r'^magictokenlogin/([0-9a-zA-Z]+)/$', MagicTokenLogin.as_view(), name='magic_token_login'),
+    url(r'^magictokenlogin/([$_0-9a-zA-Z]+)/$', MagicTokenLogin.as_view(), name='magic_token_login'),
 )