Files @ 5f7e5ee1bd82
Branch filter:

Location: symposion_app/static/src/pyconau2017/images/favicon.png

Nick Seidenman (N6)
Merge branch 'master' into prod

Conflicts:
fixtures/conference.json
fixtures/sites.json