Files @ cb4b0fac3871
Branch filter:

Location: symposion_app/requirements-test.txt

Patrick Altman
Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility

Conflicts:
symposion/boxes/urls.py
symposion/cms/urls.py
symposion/conference/urls.py
symposion/proposals/models.py
symposion/proposals/urls.py
symposion/reviews/urls.py
symposion/schedule/models.py
symposion/schedule/urls.py
symposion/speakers/urls.py
symposion/sponsorship/urls.py
symposion/teams/urls.py
Django==1.4.15
Pillow==2.5.3
django-discover-runner==1.0
django-markitup==2.2.2
django-model-utils==1.5.0
django-nose==1.2
django-reversion==1.8.0
django-timezones==0.2
factory-boy==2.4.1
nose==1.3.4
pytz==2014.7