Merge branch 'master' of github.com:pydanny/cookiecutter-django

This commit is contained in:
Daniel Roy Greenfeld 2015-10-03 15:42:40 -07:00
commit 0c9dfd8de6

View File

@ -12,7 +12,7 @@ urlpatterns = [
url(r'^$', TemplateView.as_view(template_name='pages/home.html'), name="home"),
url(r'^about/$', TemplateView.as_view(template_name='pages/about.html'), name="about"),
# Django Admin, use {% url 'admin:index' %}
# Django Admin, use {% raw %}{% url 'admin:index' %}{% endraw %}
url(settings.ADMIN_URL, include(admin.site.urls)),
# User management