Luke Hatcher 637921628e 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		2012-05-21 20:10:32 -04:00
..
about	pinax account project	2012-02-05 13:53:49 -05:00
cms	adding prototype cms app with pages and menu	2012-02-05 20:34:49 -05:00
sponsorship	added sponsorship template tags and template fragments; improved admin	2012-02-05 17:13:06 -05:00
_footer.html	pinax account project	2012-02-05 13:53:49 -05:00
homepage.html	pinax account project	2012-02-05 13:53:49 -05:00
site_base.html	adding menu context processor and hooking up template	2012-02-05 22:01:56 -05:00