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

Trivial merge