Merge remote-tracking branch 'origin/2.3'
authorChristian Kamm <mail@ckamm.de>
Wed, 12 Jul 2017 08:06:04 +0000 (10:06 +0200)
committerChristian Kamm <mail@ckamm.de>
Wed, 12 Jul 2017 08:06:04 +0000 (10:06 +0200)
commitda54b3d7e56e636d89f2ed07287246695585abe2
tree4a8430c8cf927a57b6750e93af94456e8fdcadcc
parent971abaea801a413921421a5887463c4234c0c116
parentc9db5d234f98397f1166ce618c48bf28149324f9
Merge remote-tracking branch 'origin/2.3'
ChangeLog
src/libsync/syncengine.cpp
test/testsyncjournaldb.cpp