repositories / ssproject1617.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f7b3ca 25df7fe)
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/ssproject1617
authorDaan Sprenkels <dsprenkels@gmail.com>
Wed, 9 Nov 2016 12:37:50 +0000 (13:37 +0100)
committerDaan Sprenkels <dsprenkels@gmail.com>
Wed, 9 Nov 2016 12:37:50 +0000 (13:37 +0100)

Trivial merge