Luke Hatcher b06daba446 Merge branch 'master' into cms-features ... * master: added BSD license Update master use django-forms-bootstrap fixed account links on homepage fixed staticfiles settings removed homepage use of ifsetting_tag updated urls updated templates updated imports to reflect new layout updated imports to reflect new layout updated settings updated manage.py updated requirements to 1.4 / DUA and latest versions updated project layout for 1.4 (without content changes) Conflicts: requirements/base.txt symposion/settings.py symposion_project/urls.py		2012-07-10 15:35:30 -04:00
..
menu.html	Merge branch 'master' into cms-features	2012-07-10 15:35:30 -04:00