equal
deleted
inserted
replaced
9 |
9 |
10 urlpatterns = patterns('', |
10 urlpatterns = patterns('', |
11 # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), |
11 # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), |
12 url(r'^admin/', include(admin.site.urls)), |
12 url(r'^admin/', include(admin.site.urls)), |
13 url(r'^admin$', include(admin.site.urls)), |
13 url(r'^admin$', include(admin.site.urls)), |
14 |
14 |
15 # Default. |
15 # Default. |
16 url(r'^', include(qrurls.urls.urlpatterns)), |
16 url(r'^', include(qrurls.urls.urlpatterns)), |
17 ) |
17 ) |
18 |
18 |
19 if settings.DEBUG: |
19 if settings.DEBUG: |