repositories / ssproject1617.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b94532f 5ea350e)
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/ssproject1617
authorKelley van Evert <hello@kelleyvanevert.nl>
Mon, 24 Oct 2016 12:19:30 +0000 (14:19 +0200)
committerKelley van Evert <hello@kelleyvanevert.nl>
Mon, 24 Oct 2016 12:19:30 +0000 (14:19 +0200)

Trivial merge