cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-22 20:47:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
tgstation-server-ci[bot]
2024-08-25 04:23:52 +00:00
parent 8ef3df149c 62ee5fac78
commit e19e3fe1d0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/stable-merge.yml
+1 -1
View File
@@ -29,7 +29,7 @@ jobs:
token: ${{ steps.app-token-generation.outputs.token }}
- name: Merge master into dev
uses: robotology/gh-action-nightly-merge@14b4a4cf358f7479aa708bee05cf8a794d6a2516 #v1.5.0
uses: robotology/gh-action-nightly-merge@81570ba03dd370f582bd3f52d47672d29191829f #v1.5.2
with:
stable_branch: master
development_branch: dev