Files @ 5f7e5ee1bd82
Branch filter:

Location: symposion_app/Procfile

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

Conflicts:
fixtures/conference.json
fixtures/sites.json
web: gunicorn --bind=0.0.0.0 --log-file - pinaxcon.wsgi