Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/pinaxcon/registrasion/migrations/0002_auto_20160922_0638.py
5f7e5ee1bd82
807 B
text/x-python
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json