Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/tox.ini
5f7e5ee1bd82
70 B
text/x-ini
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json