James Tauber 9e78e1ace3 Merge branch 'fresh-start' into sponsorship ... Conflicts: symposion_project/settings.py		2012-02-05 22:04:54 -05:00
..
about	pinax account project	2012-02-05 13:53:49 -05:00
conference	initial conference/section models	2012-02-05 21:59:14 -05:00
sponsorship	added sponsorship template tags and template fragments; improved admin	2012-02-05 17:13:06 -05:00
__init__.py	pinax account project	2012-02-05 13:53:49 -05:00