symposion_app/symposion_project
Luke Hatcher 4ebfc6d2ba Merge branch 'fresh-start' into cms-features
Conflicts:
	symposion_project/settings.py
2012-02-05 22:37:24 -05:00
..
apps Merge branch 'fresh-start' into cms-features 2012-02-05 22:37:24 -05:00
docs added some initial wording to the docs 2012-02-05 17:51:04 -05:00
fixtures pinax account project 2012-02-05 13:53:49 -05:00
requirements Merge branch 'fresh-start' into cms-features 2012-02-05 20:43:09 -05:00
static pinax account project 2012-02-05 13:53:49 -05:00
templates adding menu context processor and hooking up template 2012-02-05 22:01:56 -05:00
__init__.py pinax account project 2012-02-05 13:53:49 -05:00
manage.py pinax account project 2012-02-05 13:53:49 -05:00
settings.py Merge branch 'fresh-start' into cms-features 2012-02-05 22:37:24 -05:00
urls.py adding prototype cms app with pages and menu 2012-02-05 20:34:49 -05:00
wsgi.py pinax account project 2012-02-05 13:53:49 -05:00