repositories / ssproject1617.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af25f63 76aa056)
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/ssproject1617
authorKelley van Evert <hello@kelleyvanevert.nl>
Wed, 30 Nov 2016 12:58:33 +0000 (13:58 +0100)
committerKelley van Evert <hello@kelleyvanevert.nl>
Wed, 30 Nov 2016 12:58:33 +0000 (13:58 +0100)

Trivial merge