repositories / ssproject1617.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdc17a7 2da5073)
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/ssproject1617
authorDaan Sprenkels <dsprenkels@gmail.com>
Fri, 25 Nov 2016 09:20:07 +0000 (10:20 +0100)
committerDaan Sprenkels <dsprenkels@gmail.com>
Fri, 25 Nov 2016 09:20:07 +0000 (10:20 +0100)

Trivial merge