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	hook up django reversion	2012-02-05 22:30:14 -05:00
conference	fixed coding convention nits	2012-02-22 17:37:05 -05:00
sponsorship	internationalized the sponsor model fields	2012-02-22 17:35:21 -05:00
__init__.py	pinax account project	2012-02-05 13:53:49 -05:00