diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2020-02-25 13:45:27 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2020-02-25 13:45:27 +0300 |
| commit | dc1070d02d63f98a59425d02340ae8da6c9a9928 (patch) | |
| tree | 7a8625591f3e71d0e62ea77ccc47061013a1abe6 /cmake | |
| parent | a86b9677ca24ba67d7eed250c195b2dad3f8c9f9 (diff) | |
| parent | aab8ee3e779adb60eebe4772995dbe7431f7f80e (diff) | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
CHANGELOG.md
VERSION.cmake
src/gui/MacOSXBundleInfo.plist
src/gui/folderstatusmodel.h
src/gui/settingsdialog.cpp
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindLibcloudproviders.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/modules/FindLibcloudproviders.cmake b/cmake/modules/FindLibcloudproviders.cmake index 9b01f3a94..527c7509b 100644 --- a/cmake/modules/FindLibcloudproviders.cmake +++ b/cmake/modules/FindLibcloudproviders.cmake @@ -1,4 +1,4 @@ -# (c) 2019 Copyright ownCloud GmbH +# (c) 2019-2020 Copyright ownCloud GmbH # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING* file. |