Files @ 5f7e5ee1bd82
Branch filter:

Location: symposion_app/cms_pages/views.py

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

Conflicts:
fixtures/conference.json
fixtures/sites.json
1
2
3
from django.shortcuts import render

# Create your views here.