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)
commit5b2877a63ea5f9d217318fc349b7ba5f4232c846
tree377ebe362bee128e72056d465a83642d271f4f0c
parent29e02d0579d16fd452b051978e4d375f7aab6c82
parentbf838bd33660fe8d1bfd086835728817501d36a1
Merge branch 'master' into resource-cleanup

Signed-off-by: Michael Schuster <michael@schuster.ms>
src/gui/CMakeLists.txt
src/gui/sharelinkwidget.cpp
src/gui/shareusergroupwidget.ui
src/gui/shareuserline.ui