nextcloud-desktop.git
6 years agoUse … instead of 3 dots
Joas Schilling [Thu, 14 Nov 2019 22:23:43 +0000 (23:23 +0100)]
Use … instead of 3 dots

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoFix some translations
Joas Schilling [Thu, 14 Nov 2019 22:15:49 +0000 (23:15 +0100)]
Fix some translations

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoImprove the translation of "Share via …"
Joas Schilling [Thu, 14 Nov 2019 21:29:30 +0000 (22:29 +0100)]
Improve the translation of "Share via …"

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 2 Dec 2019 03:10:52 +0000 (03:10 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 30 Nov 2019 03:10:58 +0000 (03:10 +0000)]
[tx-robot] updated from transifex

6 years agoFix copyright year in MacOSXBundleInfo.plist.in for 2019
Michael Schuster [Fri, 29 Nov 2019 16:04:22 +0000 (17:04 +0100)]
Fix copyright year in MacOSXBundleInfo.plist.in for 2019

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoUse ReadPasswordJob::finished for ReadPasswordJob
Michael Schuster [Fri, 29 Nov 2019 03:47:40 +0000 (04:47 +0100)]
Use ReadPasswordJob::finished for ReadPasswordJob

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoFix remote wipe keychain storage (issue #1592)
Michael Schuster [Fri, 29 Nov 2019 03:28:50 +0000 (04:28 +0100)]
Fix remote wipe keychain storage (issue #1592)

The app password for the remote wipe was constantly being written in
WebFlowCredentials::slotFinished to the keychain, leading to unnecessary
write and log overhead on the system.

This fix introduces a check to only store the app password once in
a lifetime of the Account class. Also the method used to store the
password will be renamed from setAppPassword to writeAppPasswordOnce
to be more expressive.

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 29 Nov 2019 03:10:32 +0000 (03:10 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 28 Nov 2019 03:12:08 +0000 (03:12 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 27 Nov 2019 03:07:47 +0000 (03:07 +0000)]
[tx-robot] updated from transifex

6 years agoBuild for Debian stable and oldstable
István Váradi [Tue, 19 Nov 2019 18:32:47 +0000 (19:32 +0100)]
Build for Debian stable and oldstable

Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
6 years agoFix legal notice year
Christoph Wurst [Mon, 25 Nov 2019 18:33:50 +0000 (19:33 +0100)]
Fix legal notice year

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 26 Nov 2019 03:07:54 +0000 (03:07 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 23 Nov 2019 03:09:19 +0000 (03:09 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 22 Nov 2019 03:09:11 +0000 (03:09 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 21 Nov 2019 03:08:55 +0000 (03:08 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 20 Nov 2019 03:09:39 +0000 (03:09 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 19 Nov 2019 03:08:32 +0000 (03:08 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 18 Nov 2019 03:06:58 +0000 (03:06 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1623 from nextcloud/mac-prepare-notarization
Michael Schuster [Sun, 17 Nov 2019 20:54:47 +0000 (21:54 +0100)]
Merge pull request #1623 from nextcloud/mac-prepare-notarization

macOS build: Avoid the Get-Task-Allow Entitlement (Notarization)

6 years agomacOS build: Avoid the Get-Task-Allow Entitlement (Notarization)
Michael Schuster [Sun, 17 Nov 2019 20:33:04 +0000 (21:33 +0100)]
macOS build: Avoid the Get-Task-Allow Entitlement (Notarization)

Setting CODE_SIGN_INJECT_BASE_ENTITLEMENTS to NO is required for macOS
Notarization.

See: https://developer.apple.com/documentation/xcode/notarizing_macos_software_before_distribution/resolving_common_notarization_issues

And upstream: https://github.com/owncloud/client/pull/7007/commits/97f4af32ae1b64e835bb41c78c8abe6689916c01

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoMerge pull request #1621 from nextcloud/mac-sign-timestamp
Michael Schuster [Sun, 17 Nov 2019 17:12:29 +0000 (18:12 +0100)]
Merge pull request #1621 from nextcloud/mac-sign-timestamp

Add timestamp to Mac installer code signing

6 years agoAdd timestamp to Mac installer code signing
Michael Schuster [Sun, 17 Nov 2019 16:50:52 +0000 (17:50 +0100)]
Add timestamp to Mac installer code signing

Use the --timestamp option for 'productsign' to add a secure timestamp.

See: https://developer.apple.com/documentation/xcode/notarizing_macos_software_before_distribution/resolving_common_notarization_issues

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 17 Nov 2019 03:09:30 +0000 (03:09 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1619 from nextcloud/bumpQt-5.12.5
Michael Schuster [Sun, 17 Nov 2019 02:19:25 +0000 (03:19 +0100)]
Merge pull request #1619 from nextcloud/bumpQt-5.12.5

Bump Qt 5.12.5 image

6 years agoFix: add /usr/local/lib to LD_LIBRARY_PATH for OpenSSL 1.1.1
Michael Schuster [Sun, 17 Nov 2019 01:56:53 +0000 (02:56 +0100)]
Fix: add /usr/local/lib to LD_LIBRARY_PATH for OpenSSL 1.1.1

Drone pipeline qt-5.12 failed because the unit tests didn't find OpenSSL.

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoFix: escape env vars
Michael Schuster [Sun, 17 Nov 2019 00:59:04 +0000 (01:59 +0100)]
Fix: escape env vars

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoBump Qt 5.12.5 image
Michael Schuster [Sun, 17 Nov 2019 00:30:53 +0000 (01:30 +0100)]
Bump Qt 5.12.5 image

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoMerge pull request #1617 from nextcloud/appimageQt-5.12.5
Michael Schuster [Sat, 16 Nov 2019 21:09:36 +0000 (22:09 +0100)]
Merge pull request #1617 from nextcloud/appimageQt-5.12.5

Upgrade for Qt 5.12.5 in docker-ci

6 years agoFix dir in upload script
Michael Schuster [Sat, 16 Nov 2019 20:53:25 +0000 (21:53 +0100)]
Fix dir in upload script

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoMake AppImage upload optional and add timeout
Michael Schuster [Sat, 16 Nov 2019 20:36:59 +0000 (21:36 +0100)]
Make AppImage upload optional and add timeout

Moves the upload into a separate Drone command and adds a timeout for curl
to fail after 15 minutes.

Returns zero to keep Drone from failing.

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoMove .desktop file path to new env var to avoid duplicates
Michael Schuster [Sat, 16 Nov 2019 20:34:13 +0000 (21:34 +0100)]
Move .desktop file path to new env var to avoid duplicates

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoUpgrade for Qt 5.12.5 in docker-ci
Michael Schuster [Sat, 16 Nov 2019 20:31:07 +0000 (21:31 +0100)]
Upgrade for Qt 5.12.5 in docker-ci

- Use the new image: nextcloudci/client-5.12:client-5.12-5
- Use it's new QT_BASE_DIR: /opt/qt5.12.5

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 16 Nov 2019 03:06:41 +0000 (03:06 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 15 Nov 2019 03:07:58 +0000 (03:07 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 14 Nov 2019 03:07:51 +0000 (03:07 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1604 from nextcloud/rakekniven-patch-1
Michael Schuster [Thu, 14 Nov 2019 02:22:29 +0000 (03:22 +0100)]
Merge pull request #1604 from nextcloud/rakekniven-patch-1

l10n: Remove string from Transifex resource

6 years agoMerge pull request #1605 from nextcloud/revert-1586-qt5.5-compat
Michael Schuster [Thu, 14 Nov 2019 02:19:09 +0000 (03:19 +0100)]
Merge pull request #1605 from nextcloud/revert-1586-qt5.5-compat

Revert and Fix "Remove HTTP/2 support from Xenial"

6 years agoFix: Apply http2 patch from owncloud #1573 - only with Qt >= 5.8
Michael Schuster [Thu, 14 Nov 2019 01:39:06 +0000 (02:39 +0100)]
Fix: Apply http2 patch from owncloud #1573 - only with Qt >= 5.8

Drone builds failed with Qt 5.7 and we introduce a new ifdef here
to avoid patching specifically for Ubuntu Xenial only.

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoRevert "Remove HTTP/2 support from Xenial"
Michael Schuster [Thu, 14 Nov 2019 01:22:01 +0000 (02:22 +0100)]
Revert "Remove HTTP/2 support from Xenial"

6 years agoMerge pull request #1586 from ivaradi/qt5.5-compat
Michael Schuster [Thu, 14 Nov 2019 00:45:19 +0000 (01:45 +0100)]
Merge pull request #1586 from ivaradi/qt5.5-compat

Remove HTTP/2 support from Xenial

6 years agol10n: Remove string from Transifex resource
rakekniven [Wed, 13 Nov 2019 17:03:22 +0000 (18:03 +0100)]
l10n: Remove string from Transifex resource

Fix for #1578

Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 13 Nov 2019 03:07:30 +0000 (03:07 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 12 Nov 2019 03:09:20 +0000 (03:09 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 10 Nov 2019 03:11:47 +0000 (03:11 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 9 Nov 2019 03:03:34 +0000 (03:03 +0000)]
[tx-robot] updated from transifex

6 years agoMerge branch 'master' into qt5.5-compat
Michael Schuster [Thu, 7 Nov 2019 14:49:43 +0000 (15:49 +0100)]
Merge branch 'master' into qt5.5-compat

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 7 Nov 2019 03:06:07 +0000 (03:06 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 6 Nov 2019 03:08:01 +0000 (03:08 +0000)]
[tx-robot] updated from transifex

6 years agoRemove HTTP/2 support from Xenial
István Váradi [Tue, 5 Nov 2019 18:20:45 +0000 (19:20 +0100)]
Remove HTTP/2 support from Xenial

Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 5 Nov 2019 03:05:20 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1522 from adrb/issue_1351
Camila Ayres [Mon, 4 Nov 2019 21:48:20 +0000 (22:48 +0100)]
Merge pull request #1522 from adrb/issue_1351

 * fix for issue no. 1351

6 years agoMerge branch 'master' into issue_1351
Camila Ayres [Mon, 4 Nov 2019 21:48:07 +0000 (22:48 +0100)]
Merge branch 'master' into issue_1351

6 years agoMerge pull request #1573 from Milokita/master
Camila Ayres [Mon, 4 Nov 2019 19:21:17 +0000 (20:21 +0100)]
Merge pull request #1573 from Milokita/master

Fix #1182 - upload of files with umlaut.

6 years agoMerge branch 'master' into master
Camila Ayres [Mon, 4 Nov 2019 19:20:32 +0000 (20:20 +0100)]
Merge branch 'master' into master

6 years agoMerge pull request #1579 from nextcloud/fix-remote-wipe-proxy
Camila Ayres [Mon, 4 Nov 2019 19:16:53 +0000 (20:16 +0100)]
Merge pull request #1579 from nextcloud/fix-remote-wipe-proxy

Fix remote wipe when a proxy is configured.

6 years agoMerge branch 'master' into master
Camila Ayres [Mon, 4 Nov 2019 19:14:11 +0000 (20:14 +0100)]
Merge branch 'master' into master

6 years agoMerge branch 'master' into fix-remote-wipe-proxy
Michael Schuster [Mon, 4 Nov 2019 18:58:56 +0000 (19:58 +0100)]
Merge branch 'master' into fix-remote-wipe-proxy

6 years agoMerge pull request #1580 from nextcloud/fix-updater-message
Camila Ayres [Mon, 4 Nov 2019 18:55:39 +0000 (19:55 +0100)]
Merge pull request #1580 from nextcloud/fix-updater-message

Fix updater message: Download link instead of "use the system's updat…

6 years agoFix updater message: Download link instead of "use the system's update tool"
Michael Schuster [Mon, 4 Nov 2019 18:19:59 +0000 (19:19 +0100)]
Fix updater message: Download link instead of "use the system's update tool"

Provide a download link to the new version instead of the confusing message that
users should use their "system's update tool to install it".

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoFix remote wipe when a proxy is configured.
Camila San [Mon, 4 Nov 2019 17:43:52 +0000 (17:43 +0000)]
Fix remote wipe when a proxy is configured.

Signed-off-by: Camila San <hello@camila.codes>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 4 Nov 2019 03:08:04 +0000 (03:08 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 3 Nov 2019 03:09:40 +0000 (03:09 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 2 Nov 2019 03:04:09 +0000 (03:04 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 1 Nov 2019 02:56:47 +0000 (02:56 +0000)]
[tx-robot] updated from transifex

6 years agoMerge branch 'master' of https://github.com/Milokita/desktop
XNG [Fri, 1 Nov 2019 01:35:19 +0000 (09:35 +0800)]
Merge branch 'master' of https://github.com/Milokita/desktop

6 years agoApply http2 patch from owncloud
XNG [Fri, 1 Nov 2019 01:22:52 +0000 (09:22 +0800)]
Apply http2 patch from owncloud
Signed-off-by: XNG <Milokita@users.noreply.github.com>
6 years agoApply http2 patch from owncloud
XNG [Fri, 1 Nov 2019 01:22:52 +0000 (09:22 +0800)]
Apply http2 patch from owncloud
Signed-off-by: XNG <Milokita@users.noreply.github.com>
6 years agoMerge pull request #1 from nextcloud/master
XNG [Fri, 1 Nov 2019 00:48:06 +0000 (08:48 +0800)]
Merge pull request #1 from nextcloud/master

Just some catch up

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 31 Oct 2019 02:57:51 +0000 (02:57 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 30 Oct 2019 02:56:18 +0000 (02:56 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1429 from nextcloud/recipientnote
Dominique Fuchs [Tue, 29 Oct 2019 13:49:36 +0000 (14:49 +0100)]
Merge pull request #1429 from nextcloud/recipientnote

Finishing PR #1154

6 years agoresolving conflict with current master
Dominique Fuchs [Tue, 29 Oct 2019 13:07:26 +0000 (14:07 +0100)]
resolving conflict with current master

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
6 years agoMerge branch 'master' into recipientnote
Dominique Fuchs [Tue, 29 Oct 2019 11:58:14 +0000 (12:58 +0100)]
Merge branch 'master' into recipientnote

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 29 Oct 2019 03:05:48 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 28 Oct 2019 03:05:30 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1451 from nextcloud/move-rtfiles
Michael Schuster [Sun, 27 Oct 2019 17:03:49 +0000 (18:03 +0100)]
Merge pull request #1451 from nextcloud/move-rtfiles

Move journal files away from sync folder to standardized location

6 years agoMerge branch 'master' into move-rtfiles
Michael Schuster [Sun, 27 Oct 2019 16:49:22 +0000 (17:49 +0100)]
Merge branch 'master' into move-rtfiles

6 years agoMerge pull request #1449 from nextcloud/lnx-domainname-desktopfiles
Michael Schuster [Sun, 27 Oct 2019 16:48:28 +0000 (17:48 +0100)]
Merge pull request #1449 from nextcloud/lnx-domainname-desktopfiles

Linux/Wayland: Updated .desktop file naming scheme

6 years agoMerge branch 'master' into lnx-domainname-desktopfiles
Michael Schuster [Sun, 27 Oct 2019 16:30:48 +0000 (17:30 +0100)]
Merge branch 'master' into lnx-domainname-desktopfiles

6 years agoMerge pull request #1454 from nextcloud/syncjournal-del-prio
Michael Schuster [Sun, 27 Oct 2019 16:29:03 +0000 (17:29 +0100)]
Merge pull request #1454 from nextcloud/syncjournal-del-prio

Prioritize DELETE instruction in SyncFileVector (merged trees)

6 years agofix tab spacing
Michael Schuster [Sun, 27 Oct 2019 16:25:50 +0000 (17:25 +0100)]
fix tab spacing

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agotab formatting (just a little more ;p)
Michael Schuster [Sun, 27 Oct 2019 16:03:23 +0000 (17:03 +0100)]
tab formatting (just a little more ;p)

Signed-off-by: Michael Schuster <michael@schuster.ms>
6 years agoMerge branch 'syncjournal-del-prio' of https://github.com/nextcloud/desktop into...
Dominique Fuchs [Sun, 27 Oct 2019 15:56:07 +0000 (16:56 +0100)]
Merge branch 'syncjournal-del-prio' of https://github.com/nextcloud/desktop into syncjournal-del-prio

6 years agotab formatting
Dominique Fuchs [Sun, 27 Oct 2019 15:55:37 +0000 (16:55 +0100)]
tab formatting

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
6 years agoMerge branch 'master' into move-rtfiles
Dominique Fuchs [Sun, 27 Oct 2019 14:43:41 +0000 (15:43 +0100)]
Merge branch 'master' into move-rtfiles

6 years agoMerge branch 'master' into syncjournal-del-prio
Dominique Fuchs [Sun, 27 Oct 2019 14:38:43 +0000 (15:38 +0100)]
Merge branch 'master' into syncjournal-del-prio

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 27 Oct 2019 03:04:17 +0000 (03:04 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 26 Oct 2019 03:05:59 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 25 Oct 2019 03:06:12 +0000 (03:06 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 24 Oct 2019 03:05:27 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1554 from sryze/fix-duplicate-apps
Michael Schuster [Wed, 23 Oct 2019 21:44:54 +0000 (23:44 +0200)]
Merge pull request #1554 from sryze/fix-duplicate-apps

Fix duplicate items in Apps menu (a bug introduced in #1477)

6 years agoFix duplicate items in Apps menu (a bug introduced in #1477)
Sergey Zolotarev [Wed, 23 Oct 2019 20:50:58 +0000 (02:50 +0600)]
Fix duplicate items in Apps menu (a bug introduced in #1477)

Signed-off-by: Sergey Zolotarev <sryze@protonmail.com>
6 years agoMerge pull request #1553 from nextcloud/jospoortvliet-patch-1
Michael Schuster [Wed, 23 Oct 2019 20:45:55 +0000 (22:45 +0200)]
Merge pull request #1553 from nextcloud/jospoortvliet-patch-1

Update ChangeLog

6 years agoUpdate ChangeLog
Jos Poortvliet [Wed, 23 Oct 2019 19:30:40 +0000 (21:30 +0200)]
Update ChangeLog

Link to https://github.com/nextcloud/desktop/releases as there's no plan to keep the changelog file up to date.

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 23 Oct 2019 03:05:14 +0000 (03:05 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #1529 from nextcloud/samu-workopen-patch-2-1
Camila Ayres [Tue, 22 Oct 2019 13:08:11 +0000 (15:08 +0200)]
Merge pull request #1529 from nextcloud/samu-workopen-patch-2-1

Replace command line Step 5 Install Homebrew

6 years agoMerge branch 'master' into samu-workopen-patch-2-1
Camila Ayres [Tue, 22 Oct 2019 13:08:01 +0000 (15:08 +0200)]
Merge branch 'master' into samu-workopen-patch-2-1

6 years agoMerge pull request #1530 from nextcloud/samu-workopen-patch-1
Camila Ayres [Tue, 22 Oct 2019 13:01:58 +0000 (15:01 +0200)]
Merge pull request #1530 from nextcloud/samu-workopen-patch-1

Update Installing Mac Step 11