From ee74991b3f339f76bdcf92df1491f21369922fe3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 17 May 2023 15:56:25 +0200
Subject: [PATCH] feat(deps): Add Nextcloud 28 support

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .github/workflows/psalm.yml | 8 ++++++++
 appinfo/info.xml            | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index 7be48f26..bfe90900 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -20,6 +20,14 @@ concurrency:
 jobs:
   static-analysis:
     runs-on: ubuntu-latest
+<<<<<<< master:.github/workflows/psalm.yml
+=======
+    strategy:
+      # do not stop on another job's failure
+      fail-fast: false
+      matrix:
+        ocp-version: [ 'dev-master', 'dev-stable27', 'dev-stable26', 'dev-stable25' ]
+>>>>>>> feat(deps): Add Nextcloud 28 support:.github/workflows/psalm-matrix.yml
 
     name: Nextcloud
     steps:
diff --git a/appinfo/info.xml b/appinfo/info.xml
index ea95835c..79d7b9d7 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -35,7 +35,11 @@
 		<database>pgsql</database>
 		<database>sqlite</database>
 		<database>mysql</database>
+<<<<<<< master
 		<nextcloud min-version="27" max-version="27"/>
+=======
+		<nextcloud min-version="25" max-version="27"/>
+>>>>>>> feat(deps): Add Nextcloud 28 support
 	</dependencies>
 
 	<background-jobs>