Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/static/src/pyconau2017/images/favicon.png - annotation
5f7e5ee1bd82
657 B
image/png
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json
![](/symposion_app/raw/5f7e5ee1bd82725f6f581896beaa526062ea6452/static/src/pyconau2017/images/favicon.png)