Merge branch 'release/5.1'

OpenConext · Feb 26, 2024 · 9e67dd3 · 9e67dd3
2 parents fd4d739 + 3d09a8e
commit 9e67dd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -2,7 +2,7 @@ name: test-integration
 on:
   pull_request:
   push:
-    branches: [ master, develop, feature/*, bugfix/* ]
+    branches: [ main, feature/*, bugfix/*, release/* ]
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+# 5.1.1
+- The changes from 5.0.10 got lost in release 5.1, in this version they are added back
+
 # 5.1.0
 - Introduction of the SSO on 2FA feature in Stepup-Middleware
 - Please run the provided Doctrine Migration to prepare the Middleware and Gateway projections