Files @ b06daba446a6
Branch filter:

Location: symposion_app/requirements/project.txt

Luke Hatcher
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
# project.txt is a pip requirements file which describes the distributions
# required by your project to run.

--requirement=base.txt

# Put project-specific requirements here.
# See http://pip-installer.org/requirement-format.html for more information.

PIL==1.1.7
easy-thumbnails==1.0-alpha-21