Files @ 5f7e5ee1bd82
Branch filter:

Location: symposion_app/.gitignore

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

Conflicts:
fixtures/conference.json
fixtures/sites.json
1
2
3
4
5
6
7
8
9
*.pyc
*.sublime-workspace
node_modules/
_build/
.DS_Store
dev.db
.coverage
pinaxcon/site_media/
local_settings.py