repositories / ssproject1617.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7388c6 01e7fcf)
Merge branch 'master' of gitlab.science:mlubbers/ssproject1617
authorMart Lubbers <mart@martlubbers.net>
Tue, 15 Nov 2016 18:34:49 +0000 (19:34 +0100)
committerMart Lubbers <mart@martlubbers.net>
Tue, 15 Nov 2016 18:34:49 +0000 (19:34 +0100)

Trivial merge