Merge branch 'iss02'

2016-06-07 18:20:35 +02:00
parent 5a0a1daa39 7292957497
commit d99eee4751
11 changed files with 22 additions and 46 deletions
--- a/tippy/urls.py
+++ b/tippy/urls.py
@@ -19,7 +19,6 @@ urlpatterns = patterns('',
    url(r'^accounts/', include('django.contrib.auth.urls')),
    url(r'^blog/newpost$', 'tipp.views.newBlogpost'),
    url(r'^blog/(?P<page>\d)$', 'tipp.views.blogindex'),
-    url(r'^blog/(?P<slug>[\w\-]+)', 'tipp.views.blogpost'),

    # Uncomment the admin/doc line below to enable admin documentation:
    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),