projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29e02d0 bf838bd)
Merge branch 'master' into resource-cleanup
authorMichael Schuster <michael@schuster.ms>
Sun, 1 Mar 2020 04:34:12 +0000 (05:34 +0100)
committerMichael Schuster <michael@schuster.ms>
Sun, 1 Mar 2020 04:34:12 +0000 (05:34 +0100)
Signed-off-by: Michael Schuster <michael@schuster.ms>
1  2 
src/gui/CMakeLists.txt patch | diff1 | diff2 | blob | history
src/gui/sharelinkwidget.cpp patch | diff1 | diff2 | blob | history
src/gui/shareusergroupwidget.ui patch | diff1 | diff2 | blob | history
src/gui/shareuserline.ui patch | diff1 | diff2 | blob | history

diff --cc src/gui/CMakeLists.txt
Simple merge
diff --cc src/gui/sharelinkwidget.cpp
Simple merge
diff --cc src/gui/shareusergroupwidget.ui
Simple merge
diff --cc src/gui/shareuserline.ui
Simple merge
Unnamed repository; edit this file 'description' to name the repository.