repositories / ssproject1617.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54ea367 de72788)
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/ssproject1617 into dsprenkels...
authorDaan Sprenkels <dsprenkels@gmail.com>
Mon, 7 Nov 2016 14:35:33 +0000 (15:35 +0100)
committerDaan Sprenkels <dsprenkels@gmail.com>
Mon, 7 Nov 2016 14:35:33 +0000 (15:35 +0100)

Trivial merge