Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/static/src/pyconau2017/images/favicon.ico
5f7e5ee1bd82
14.7 KiB
image/vnd.microsoft.icon
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json
Binary file (image/vnd.microsoft.icon)