projects / siridb-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae49081 fb36e85)
Merge pull request #109 from AnjaBruls/master
authorJeroen van der Heijden <jeroen@transceptor.technology>
Thu, 6 Dec 2018 08:33:25 +0000 (09:33 +0100)
committerGitHub <noreply@github.com>
Thu, 6 Dec 2018 08:33:25 +0000 (09:33 +0100)
Fixed the bug in merging of data and added a test


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.