Merge remote-tracking branch 'origin/2.3'
authorOlivier Goffart <ogoffart@woboq.com>
Thu, 13 Apr 2017 08:19:35 +0000 (10:19 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Thu, 13 Apr 2017 08:19:35 +0000 (10:19 +0200)
commit1ed4eb46f20793b7f0742f4c058f6ce20de9515a
tree605973cf3c9419423bfba40bcc203b9cb224c989
parent7c31da5a957cdc5b1295a1d24ef15d03770d49c4
parent4af45394f9f61fbc68c9f0a4d2e5387d14052e3b
Merge remote-tracking branch 'origin/2.3'

 Conflicts:
VERSION.cmake
doc/owncloudcmd.rst
doc/troubleshooting.rst
src/gui/accountsettings.cpp
src/gui/folder.cpp
src/gui/owncloudsetupwizard.cpp
src/gui/shareusergroupwidget.cpp
src/libsync/propagatedownload.cpp
src/libsync/propagateuploadng.cpp