nextcloud-desktop/docs/modules/ROOT
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
..
assets LogWindow: Remove output, add "go to log folder" button #6475 2019-04-09 13:15:05 +02:00
examples
pages Merge remote-tracking branch 'origin/2.6' 2020-02-25 11:45:27 +01:00
nav.adoc