Merge branch 'master' of gitlab.science.ru.nl:mlubbers/ssproject1617 into dsprenkels...
authorDaan Sprenkels <dsprenkels@gmail.com>
Mon, 7 Nov 2016 14:35:33 +0000 (15:35 +0100)
committerDaan Sprenkels <dsprenkels@gmail.com>
Mon, 7 Nov 2016 14:35:33 +0000 (15:35 +0100)
commitf67157c455b6d2362bc3969f55b0f862de0373fd
tree63aa298082271917efb3cadd9ca67ec21fd4dc88
parent54ea3677b55a7ee4903daa4a6b32ae0fea5eaf91
parentde7278874a8556b0f02c78d63345864e8b47b7d5
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/ssproject1617 into dsprenkels/authentication