merge: resolve conflicts with origin/master

4d2f519

Select commit

Loading

Failed to load commit list.

There was an error while loading. Please reload this page.

DCO

Check translations on: pull_request

checkGermanTranslations

checkTranslations

Block fixup and squash commits on: pull_request 1

Block fixup and squash commits

SonarCloud analysis on: pull_request 1

SonarCloud analysis

Windows Build and Test on: pull_request 1

Windows Build and Test

REUSE Compliance Check on: pull_request

reuse-compliance-check

mac-crafter CI on: pull_request

Test mac-crafter

Block unconventional commits on: pull_request

Block unconventional commits

NextcloudFileProviderKit on: pull_request

Lint

Tests

nextcloudcmd provisioning tests on: pull_request 1

nextcloudcmd provisioning tests

Linux Appimage Package on: pull_request 1

Linux Appimage Package

Linux GCC compilation and tests on: pull_request 1

Linux GCC compilation and tests

clang-tidy-review on: pull_request 1

clang-tidy

QML Label component check on: pull_request

QML Label component check

Linux Clang compilation and tests on: pull_request 1

Linux Clang compilation and tests

Clang Format Checker on: pull_request 20

build

macOS CI on: pull_request 5

Set up Craft and install dependencies

Build and test File Provider client / Build nextcloud-client

Build and test File Provider client / Run tests

Build and test classic client / Build nextcloud-client

Build and test classic client / Run tests