Merge remote-tracking branch 'origin/master' into 2.3
authorOlivier Goffart <ogoffart@woboq.com>
Fri, 27 Jan 2017 16:45:05 +0000 (17:45 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Fri, 27 Jan 2017 16:45:05 +0000 (17:45 +0100)
commit0d16cf41fea41de9bf3bff9ceb8674b2f878c75b
tree5c2faff70136c9612f8c8f95cd9fda2231c92ef5
parent4f28b2daadd0a902a955325b6de9f93ba356f611
parent65e4afedc4034886463a46885186a9e813e957ba
Merge remote-tracking branch 'origin/master' into 2.3

We can do that because the only changes that were in master but not in 2.3 were the
translations change and documentation change, and the support for the 'M' permission
which we want in 2.3.
src/gui/folder.cpp
src/gui/folder.h
src/gui/folderstatusmodel.cpp
src/libsync/syncengine.cpp
src/libsync/syncengine.h