Update 4.0.6 (20230717)

OpenSlides · Jul 17, 2023 · c7ff405 · c7ff405
2 parents 0a78b2a + 216e953
commit c7ff405
Show file tree

Hide file tree

Showing 11 changed files with 821 additions and 42 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.0.5
+4.0.6
diff --git a/dev/scripts/make-update.sh b/dev/scripts/make-update.sh
@@ -209,6 +209,7 @@ merge_stable_branches() {
 
       set_remote
       git checkout "$BRANCH_NAME"
+      check_current_branch
 
       git merge --no-ff "$mod_target_sha" --log --message "Merge main into $STABLE_BRANCH_NAME. Update $(date +%Y%m%d)"
     )