Align ry back to master while keeping changes in random_tasks.py

pull/1/head
Raymond Yee 2012-04-18 15:08:16 -07:00
parent 3cf232a804
commit ac7f9afc2a
2 changed files with 1 additions and 2 deletions

View File

@ -17,7 +17,6 @@ urlpatterns = patterns('',
(r'^api/', include('regluit.api.urls')),
(r'', include('regluit.frontend.urls')),
(r'', include('regluit.payment.urls')),
(r'', include('regluit.experimental.urls')),
(r'^selectable/', include('selectable.urls')),
url(r'^admin/', include(admin_site.urls)),
(r'^comments/', include('django.contrib.comments.urls')),