alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-07 06:43:26 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #16892 from jellyfin/Bond-009-mergeconflict

Browse Source
This commit is contained in:
Bond-009
2026-05-22 13:38:57 +02:00
committed by GitHub
parent 4ca3cd79fa 17e2d3bb11
commit 400d7d83bc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pull-request-conflict.yml vendored
View File

@@ -4,7 +4,7 @@ on:
push: push:
branches: branches:
- master - master
pull_request: pull_request_target:
issue_comment: issue_comment:
permissions: {} permissions: {}