Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/static/dist/fonts/fontawesome-webfont.svg
5f7e5ee1bd82
357.0 KiB
image/svg+xml
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json