Merge branch 'develop' into feature/supporter

2016-04-03 21:15:05 -05:00 · 2016-04-03 21:15:05 -05:00 · 0e380f6911
commit 0e380f6911
parent 8de47013ad 0ccf491441
55 changed files with 676 additions and 426 deletions
--- a/digitalglarus/views.py
+++ b/digitalglarus/views.py
@ -83,4 +83,4 @@ def supporters(request):
    context = {
        'supporters': Supporter.objects.order_by('name')
    }
-    return render(request, 'digitalglarus/supporters.html', context)
+    return render(request, 'supporters.html', context)