nextcloud-desktop/admin
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
..
osx Merge remote-tracking branch 'origin/2.6' 2020-02-25 11:45:27 +01:00
CMakeLists.txt Create Mac Pack: Copy the creator script to the build directory. 2014-08-26 18:13:43 +02:00