Merge pull request #24 from MasterOfMalt/dependabot/github_actions/devmasx/merge-branch-1.4.0

Bump devmasx/merge-branch from 1.3.1 to 1.4.0

Author: Chris Nicel

.github/workflows/test_and_promote.yml

@@ -231,7 +231,7 @@ jobs:
       - name: Merge to master
         id: merge
         if: env.ACT != 'true'
-        uses: devmasx/merge-branch@v1.3.1
+        uses: devmasx/merge-branch@1.4.0
         with:
           type: now
           from_branch: devel