Luka Trovic 6518cd464c fix: resolve merge conflicts ...

Signed-off-by: Luka Trovic <luka@nextcloud.com>

2022-05-11 11:20:01 +01:00

..

appbuild.yml

build(deps): Bump shivammathur/setup-php from 2.18.0 to 2.18.1

2022-04-16 01:07:39 +00:00

appstore-build-publish.yml

build(deps): Bump shivammathur/setup-php from 2.18.0 to 2.18.1

2022-04-16 01:07:39 +00:00

command-rebase.yml

build(deps): Bump cirrus-actions/rebase from 1.5 to 1.6

2022-04-30 04:09:31 +00:00

cypress.yml

fix: resolve merge conflicts

2022-05-11 11:20:01 +01:00

dependabot-approve-merge.yml

Updating dependabot-approve-merge.yml workflow from template

2022-02-09 16:36:02 +01:00

fixup.yml

Create fixup.yml

2021-08-03 09:24:22 +02:00

integration.yml

build(deps): Bump shivammathur/setup-php from 2.18.0 to 2.18.1

2022-04-16 01:07:39 +00:00

lint.yml

build(deps): Bump shivammathur/setup-php from 2.18.0 to 2.18.1

2022-04-16 01:07:39 +00:00

nightly.yml

build(deps): Bump shivammathur/setup-php from 2.18.0 to 2.18.1

2022-04-16 01:07:39 +00:00

nodejs.yml

Bump actions/checkout from 2.4.0 to 3

2022-03-05 07:19:51 +00:00

phpunit.yml

build(deps): Bump shivammathur/setup-php from 2.18.0 to 2.18.1

2022-04-16 01:07:39 +00:00

static-analysis.yml

build(deps): Bump shivammathur/setup-php from 2.18.0 to 2.18.1

2022-04-16 01:07:39 +00:00