Merge remote-tracking branch 'origin/2.3'
authorOlivier Goffart <ogoffart@woboq.com>
Thu, 16 Mar 2017 13:35:08 +0000 (14:35 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Thu, 16 Mar 2017 13:35:08 +0000 (14:35 +0100)
commit4597201560a9e953eddeb9e1aa799355f2da5b97
tree11ad5d8998539bc48a3c6f6be8cb517f9cb0c8e4
parent574435687ddf841e46acefc94464d01d25f09de3
parenta60370255e31708bf85d8cf36e917980c51a36f6
Merge remote-tracking branch 'origin/2.3'

 Conflicts:
src/libsync/owncloudpropagator.h
src/libsync/owncloudpropagator.h