repositories / ssproject1617.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1802be 9ccfc05)
Merge branch 'master' of https://gitlab.science.ru.nl/mlubbers/ssproject1617
authorcharlie <charlie@email.com>
Wed, 16 Nov 2016 12:03:35 +0000 (13:03 +0100)
committercharlie <charlie@email.com>
Wed, 16 Nov 2016 12:03:35 +0000 (13:03 +0100)

Trivial merge