Files @ 637921628e6f
Branch filter:

Location: symposion_app/symposion_project/apps/about/urls.py - annotation

Luke Hatcher
Merge branch 'fresh-start' into cms-features

* fresh-start:
update theme
fixed coding convention nits
internationalized the sponsor model fields
Makes conference app fields and models localizable
added documentation for conference models
made sponsorship app conference-aware
initial documentation of sponsorship app
added sponsorship template tags and template fragments; improved admin
fixed incorrect module name in import
initial sponsorship app adapted from DjangoCon

Conflicts:
symposion_project/requirements/base.txt
symposion_project/settings.py
from django.conf.urls.defaults import *
from django.views.generic.simple import direct_to_template


urlpatterns = patterns("",
    url(r"^$", direct_to_template, {"template": "about/about.html"}, name="about"),
    url(r"^terms/$", direct_to_template, {"template": "about/terms.html"}, name="terms"),
    url(r"^privacy/$", direct_to_template, {"template": "about/privacy.html"}, name="privacy"),
    url(r"^dmca/$", direct_to_template, {"template": "about/dmca.html"}, name="dmca"),
    url(r"^what_next/$", direct_to_template, {"template": "about/what_next.html"}, name="what_next"),
)