Commit graph

6 commits

Author SHA1 Message Date
James Tauber
9e78e1ace3 Merge branch 'fresh-start' into sponsorship
Conflicts:
	symposion_project/settings.py
2012-02-05 22:04:54 -05:00
James Tauber
37e6d51792 initial conference/section models 2012-02-05 21:59:14 -05:00
James Tauber
e4e7b890a2 added sponsorship template tags and template fragments; improved admin 2012-02-05 17:13:06 -05:00
James Tauber
64569bccc7 fixed incorrect module name in import 2012-02-05 15:51:27 -05:00
James Tauber
46e38bc758 initial sponsorship app adapted from DjangoCon 2012-02-05 15:03:30 -05:00
James Tauber
0f6843b08d pinax account project 2012-02-05 13:53:49 -05:00