projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bd25144
d53cfbd
)
Merge branch 'master' into issue_1351
author
Camila Ayres
<hello@camila.codes>
Mon, 4 Nov 2019 21:48:07 +0000
(22:48 +0100)
committer
GitHub
<noreply@github.com>
Mon, 4 Nov 2019 21:48:07 +0000
(22:48 +0100)
1
2
src/gui/folder.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/gui/folder.cpp
Simple merge