]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Merge branch 'master' into move-rtfiles
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Sun, 27 Oct 2019 14:43:41 +0000 (15:43 +0100)
committerGitHub <noreply@github.com>
Sun, 27 Oct 2019 14:43:41 +0000 (15:43 +0100)
1  2 
src/gui/folder.cpp
src/gui/folderman.cpp

Simple merge
Simple merge