mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-31 00:50:45 +01:00
Update Master Merge workflow
This commit is contained in:
@@ -17,7 +17,7 @@ jobs:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Merge master into dev
|
||||
uses: robotology/gh-action-nightly-merge@22f5e45d028f22837d617fa07512925457eec184 #v1.3.3
|
||||
uses: robotology/gh-action-nightly-merge@14b4a4cf358f7479aa708bee05cf8a794d6a2516 #v1.5.0
|
||||
with:
|
||||
stable_branch: 'master'
|
||||
development_branch: 'dev'
|
||||
|
||||
Reference in New Issue
Block a user