tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'd3cef824018a79ba383deab85e09c31d2673d2c3' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire committed 2026-02-09 13:11:17 +01:00
2 parents fee8a4f333 d3cef82401
commit 47b0e7897c
60 files changed
+574 -111
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/rebase-needed.yml
+1 -1
View File
@@ -18,7 +18,7 @@ jobs:
steps:
- name: Check for merge conflicts
uses: eps1lon/actions-label-merge-conflict@v3
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3
with:
dirtyLabel: 'rebase needed :construction:'
repoToken: '${{ secrets.GITHUB_TOKEN }}'