repositories / ssproject1617.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 487e019 2ba3794)
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/ssproject1617
authorMart Lubbers <mart@martlubbers.net>
Mon, 10 Oct 2016 12:05:47 +0000 (14:05 +0200)
committerMart Lubbers <mart@martlubbers.net>
Mon, 10 Oct 2016 12:05:47 +0000 (14:05 +0200)

Trivial merge