Merge branch 'dev' of github.com:SiriDB/siridb-server
authorJeroen van der Heijden <jeroen@transceptor.technology>
Thu, 10 Jan 2019 09:57:07 +0000 (10:57 +0100)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Thu, 10 Jan 2019 09:57:07 +0000 (10:57 +0100)

Trivial merge