Merge branch 'live' into 'master'

Browse Source

# Conflicts:
#   src/Handler/Utils/Submission.hs

...

This commit is contained in:

Gregor Kleen 2018-07-23 16:05:19 +02:00

parent 02fc791e0f eafba24c30

commit 2ddc0a03cb

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files