Skip to content
Snippets Groups Projects
Commit dec96800 authored by kon0379's avatar kon0379
Browse files

Merge branch 'main' into 'develop'

# Conflicts:
#   .gitlab-ci.yml
parents 320ce075 d151f3fd
1 merge request!15merge: develop into main
Pipeline #1222 passed with stages
in 6 minutes and 49 seconds
......@@ -137,5 +137,4 @@ sonarqube-vulnerability-report:
needs:
- sonarqube-check
environment:
name: qa
name: qa
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment