Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/pinaxcon/templates/site_base.html
5f7e5ee1bd82
3.7 KiB
text/html
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json