projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63d99f3 5bf48bc)
Merge remote-tracking branch 'oc/master' into master-oc
authorRoeland Jago Douma <roeland@famdouma.nl>
Wed, 23 Aug 2017 13:40:35 +0000 (15:40 +0200)
committerRoeland Jago Douma <roeland@famdouma.nl>
Wed, 23 Aug 2017 13:40:35 +0000 (15:40 +0200)
1  2 
src/gui/folderstatusdelegate.cpp patch | diff1 | diff2 | blob | history

diff --cc src/gui/folderstatusdelegate.cpp
Simple merge
Unnamed repository; edit this file 'description' to name the repository.