Merge branch 'dev' of github.com:SiriDB/siridb-server
authorJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 11 Jan 2019 15:01:07 +0000 (16:01 +0100)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 11 Jan 2019 15:01:07 +0000 (16:01 +0100)

Trivial merge