Files @ 5f7e5ee1bd82
Branch filter:

Location: symposion_app/pinaxcon/registrasion/__init__.py

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

Conflicts:
fixtures/conference.json
fixtures/sites.json
default_app_config = "pinaxcon.registrasion.apps.RegistrasionConfig"