repositories / ssproject1617.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0379c63 b52c24b)
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/ssproject1617
authorMart Lubbers <mart@martlubbers.net>
Wed, 16 Nov 2016 12:04:10 +0000 (13:04 +0100)
committerMart Lubbers <mart@martlubbers.net>
Wed, 16 Nov 2016 12:04:10 +0000 (13:04 +0100)

Trivial merge