Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/cms_pages/migrations/0011_scheduleheaderparagraph_squashed_0012_auto_20160918_0141.py
5f7e5ee1bd82
951 B
text/x-python
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json