Merge branch 'main' of git.qlic.nl:workflows/quality into feature/php-8.5

2026-03-24 10:35:24 +01:00
parent 7c7de1e38a 3176fb49bb
commit 67107d4765
1 changed files with 4 additions and 0 deletions
--- a/.gitea/workflows/quality.yml
+++ b/.gitea/workflows/quality.yml
@@ -4,7 +4,11 @@ on:
      image:
        required: false
        type: string
+<<<<<<< HEAD
        default: git.qlic.nl/qlic/quality:php8.5
+=======
+        default: git.qlic.nl/qlic/quality:php8.4
+>>>>>>> 3176fb49bb5370e8943f2f383bbfcc385a18d37a
      username:
        required: false
        type: string