Merge branch 'dev' of github.com:SiriDB/siridb-server into dropdb
authorAnja Bruls <anja@transceptor.technology>
Tue, 8 Jan 2019 08:27:20 +0000 (09:27 +0100)
committerAnja Bruls <anja@transceptor.technology>
Tue, 8 Jan 2019 08:27:20 +0000 (09:27 +0100)

Trivial merge