Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/static/src/pyconau2017/css/fonts/glyphicons-halflings-regular.ttf
5f7e5ee1bd82
44.3 KiB
font/ttf
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json
Binary file (font/ttf)