Luke Hatcher 4ebfc6d2ba Merge branch 'fresh-start' into cms-features ... Conflicts: symposion_project/settings.py		2012-02-05 22:37:24 -05: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	implemented notion of CONFERENCE_ID setting and current_conference() function	2012-02-05 22:34:12 -05:00
__init__.py	pinax account project	2012-02-05 13:53:49 -05:00