Merge branch 'master' into feature/online-auth

# Conflicts:
#	RIGS/rigboard.py
#	RIGS/test_functional.py
#	RIGS/urls.py
#	requirements.txt
This commit is contained in:
David Taylor
2017-05-12 20:53:00 +01:00
23 changed files with 382 additions and 227 deletions

View File

@@ -151,7 +151,7 @@ class EventPrint(generic.View):
merger = PdfFileMerger()
context = RequestContext(request, {
context = {
'object': object,
'fonts': {
'opensans': {
@@ -161,7 +161,7 @@ class EventPrint(generic.View):
},
'quote': True,
'current_user': request.user,
})
}
rml = template.render(context)