Files
@ 5f7e5ee1bd82
Branch filter:
Location: symposion_app/static/src/pyconau2017/css/config.rb
5f7e5ee1bd82
861 B
application/x-ruby
Merge branch 'master' into prod
Conflicts:
fixtures/conference.json
fixtures/sites.json
Conflicts:
fixtures/conference.json
fixtures/sites.json