Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/static/src/less/custom.less
5f7e5ee1bd82
1.1 KiB
text/x-less-css
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json