mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
ecb7347d33
nextcloud-desktop/cmake
History
Olivier Goffart dc1070d02d Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	CHANGELOG.md
	VERSION.cmake
	src/gui/MacOSXBundleInfo.plist
	src/gui/folderstatusmodel.h
	src/gui/settingsdialog.cpp
2020-02-25 11:45:27 +01:00
..
modules Merge remote-tracking branch 'origin/2.6' 2020-02-25 11:45:27 +01:00
scripts Minor build etc typos 2015-09-10 13:20:11 +05:45