equal
deleted
inserted
replaced
6 import qrurls.views |
6 import qrurls.views |
7 |
7 |
8 urlpatterns = patterns('', |
8 urlpatterns = patterns('', |
9 url(r'^$', qrurls.views.index, name='shorturls'), |
9 url(r'^$', qrurls.views.index, name='shorturls'), |
10 url(r'^urls/(?P<shorturl>\w+)', qrurls.views.shorturl, name='shorturl'), |
10 url(r'^urls/(?P<shorturl>\w+)', qrurls.views.shorturl, name='shorturl'), |
11 url(r'(?i)^u/(?P<shorturl_id>\d+)', qrurls.views.shorturl, name='minurl'), |
11 url(r'^(?i)u/(?P<shorturl_id>\d+)', qrurls.views.shorturl, name='miniurl'), |
12 |
12 |
13 # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), |
13 # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), |
14 url(r'^admin/', include(admin.site.urls)), |
14 url(r'^admin/', include(admin.site.urls)), |
15 ) |
15 ) |