repositories / ssproject1617.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1fdfc7 6e2ee6c)
Merge branch 'master' of https://gitlab.science.ru.nl/mlubbers/ssproject1617
authorMart <mart@martlubbers.net>
Wed, 9 Nov 2016 12:31:51 +0000 (13:31 +0100)
committerMart <mart@martlubbers.net>
Wed, 9 Nov 2016 12:31:51 +0000 (13:31 +0100)

Trivial merge