Files
@ 637921628e6f
Branch filter:
Location: symposion_app/symposion_project/apps/__init__.py
637921628e6f
0 B
text/x-python
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
* 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