Merge branch 'parenth' of github.com:SiriDB/siridb-server into dev
authorJeroen van der Heijden <jeroen@transceptor.technology>
Thu, 3 Jan 2019 19:51:45 +0000 (20:51 +0100)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Thu, 3 Jan 2019 19:51:45 +0000 (20:51 +0100)

Trivial merge