Merge branch 'KDESKTOP-1449-macOS-Finder-contextual-menu-Wording-issu… · Infomaniak/desktop-kDrive@6980197 · GitHub

Commit

Merge branch 'KDESKTOP-1449-macOS-Finder-contextual-menu-Wording-issu…

Browse files

…e' of github.com:Infomaniak/desktop-kDrive into KDESKTOP-1449-macOS-Finder-contextual-menu-Wording-issue

# Conflicts:
#	src/server/socketapi.cpp

Loading branch information

ClementKunz committed Jan 3, 2025

2 parents fac3343 + 06c6f85 commit 6980197