Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/static/src/pyconau2017/css/bootstrap-theme.css.map - annotation
5f7e5ee1bd82
42.3 KiB
text/plain
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json