Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/static/src/lca2017/images/speaker-3.jpg - annotation
5f7e5ee1bd82
6.4 MiB
image/jpeg
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json