]> dgit.raspbian.org Git - nextcloud-desktop.git/commit
Merge remote-tracking branch 'origin/2.3'
authorOlivier Goffart <ogoffart@woboq.com>
Thu, 16 Mar 2017 12:51:53 +0000 (13:51 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Thu, 16 Mar 2017 12:51:53 +0000 (13:51 +0100)
commit574435687ddf841e46acefc94464d01d25f09de3
treeb52cd3a6b343e509dab92d6204ebd6c78f03d328
parentfce194ce08a281d0c429ab7f4c3a390bd6273bb0
parent1a279ca158dde8a755caa64bdde5fadbf0a72cd5
Merge remote-tracking branch 'origin/2.3'

 Conflicts:
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
src/libsync/propagateuploadv1.cpp