projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e4ecd1 84ecbc4)
Merge branch '2.3'
authorOlivier Goffart <ogoffart@woboq.com>
Fri, 3 Mar 2017 09:57:23 +0000 (10:57 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Fri, 3 Mar 2017 09:57:23 +0000 (10:57 +0100)
 Conflicts:
src/libsync/owncloudpropagator.cpp


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