Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
This commit is contained in:
		
				commit
				
					
						45aaec38cf
					
				
			
		
					 13 changed files with 171 additions and 43 deletions
				
			
		|  | @ -8,6 +8,6 @@ urlpatterns = [ | |||
|     url(_(r'contact/?$'), ContactView.as_view(), name='contact'), | ||||
|     url(_(r'supporters/?$'), views.supporters, name='supporters'), | ||||
|     url(_(r'support-us/?$'), views.support, name='support'), | ||||
|     url(r'blog/',views.blog,name='blog'), | ||||
|     url(r'^blog/(?P<slug>\w[-\w]*)/$', views.blog_detail, name='blog-detail'), | ||||
| ] | ||||
|     url(r'blog/$', views.blog, name='blog'), | ||||
| ] | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue