Merge branch 'ondata' of github.com:SiriDB/siridb-server into dev
authorJeroen van der Heijden <jeroen@transceptor.technology>
Wed, 12 Dec 2018 10:10:28 +0000 (11:10 +0100)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Wed, 12 Dec 2018 10:10:28 +0000 (11:10 +0100)

Trivial merge