Merge branch 'develop' into feature/supporter

This commit is contained in:
Levi 2016-04-03 21:15:05 -05:00
commit 0e380f6911
55 changed files with 676 additions and 426 deletions

View file

@ -3,14 +3,9 @@ from django.conf.urls import url
from . import views
urlpatterns = [
url(r'old^$', views.index, name='index'),
url(r'old_about$', views.about, name='about'),
url(r'old_contact$', views.contact, name='contact'),
url(r'old_letscowork$', views.letscowork, name='letscowork'),
url(r'old_home$', views.home, name='home'),
url(r'supporters/?$', views.supporters, name='supporters'),
url(r'support-us/?$', views.support, name='support'),
url(r'', views.index, name='index'),
url(r'support-us/?$', views.support, name='support'), # url(r'', views.index, name='index'),
url(r'blog/',views.blog,name='blog'),
url(r'^blog/(?P<slug>\w[-\w]*)/$', views.blog_detail, name='blog-detail'),
]