repositories / ssproject1617.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25d92ff 618969f)
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/ssproject1617
authorKelley van Evert <hello@kelleyvanevert.nl>
Tue, 8 Nov 2016 18:34:27 +0000 (19:34 +0100)
committerKelley van Evert <hello@kelleyvanevert.nl>
Tue, 8 Nov 2016 18:34:27 +0000 (19:34 +0100)

Trivial merge