Merge branch 'live' into 'master'

# Conflicts: # src/Handler/Utils/Submission.hs
2018-07-23 16:05:19 +02:00 · 2018-07-23 16:05:19 +02:00 · 2ddc0a03cb
commit 2ddc0a03cb
parent 02fc791e0f eafba24c30
1 changed files with 1 additions and 1 deletions
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@ -515,4 +515,4 @@ submissionMatchesSheet tid csh shn cid = do
  shid <- fetchSheetId tid csh shn
  Submission{..} <- get404 sid
  when (shid /= submissionSheet) $ invalidArgsI [MsgSubmissionWrongSheet]
-  return sid
+  return sid