Files @ 5f7e5ee1bd82
Branch filter:

Location: symposion_app/gondor.yml

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

Conflicts:
fixtures/conference.json
fixtures/sites.json
1
2
3
4
5
6
7
buildpack: https://buildpack.gondor.io/python
site: eldarion-conferences/pinaxcon
deploy:
  services:
    - web
branches:
  master: primary