summaryrefslogtreecommitdiffhomepage
path: root/.github
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2021-08-31 13:51:52 -0400
committerGitHub <[email protected]>2021-08-31 13:51:52 -0400
commitccd5473598c4434ae8264a1ebdc957cdf6b3c947 (patch)
tree000c22ecbcd176dbf51eba12b3ec7d820b4079c4 /.github
parentde5bcc8ed0054e0b7d53f1b7919cb2d2f9d0d94f (diff)
downloadbazarr-ccd5473598c4434ae8264a1ebdc957cdf6b3c947.tar.gz
bazarr-ccd5473598c4434ae8264a1ebdc957cdf6b3c947.zip
[workflow]: Bump devmasx/merge-branch from 1.3.1 to 1.4.0 (#1524)
Bumps [devmasx/merge-branch](https://github.com/devmasx/merge-branch) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/devmasx/merge-branch/releases) - [Changelog](https://github.com/devmasx/merge-branch/blob/master/CHANGELOG.md) - [Commits](https://github.com/devmasx/merge-branch/compare/v1.3.1...1.4.0) --- updated-dependencies: - dependency-name: devmasx/merge-branch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/release_dev_to_master.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/release_dev_to_master.yaml b/.github/workflows/release_dev_to_master.yaml
index 0fd2b4aa3..5e241a66a 100644
--- a/.github/workflows/release_dev_to_master.yaml
+++ b/.github/workflows/release_dev_to_master.yaml
@@ -65,7 +65,7 @@ jobs:
uses: actions/checkout@v2
- name: Merge development -> master
- uses: devmasx/[email protected]
+ uses: devmasx/[email protected]
with:
type: now
from_branch: development