diff options
| author | Shadowghost <Ghost_of_Stone@web.de> | 2026-07-21 07:14:47 +0200 |
|---|---|---|
| committer | Shadowghost <Ghost_of_Stone@web.de> | 2026-07-21 07:14:47 +0200 |
| commit | b99703301f43927f632bbc49d040a32824d43cb3 (patch) | |
| tree | d57fed2bd6b658ddf6b1ac3ed4d2a33945f8688a /.github/workflows | |
| parent | 21801e8ba138af71c4c58489ea33534adf7426c5 (diff) | |
| parent | bdf263d8677ee87078c680a355a91a8048b8308b (diff) | |
Merge remote-tracking branch 'upstream/master' into security-path-traversal-fixes
# Conflicts:
# Jellyfin.Api/Controllers/HlsSegmentController.cs
# Jellyfin.Api/Controllers/PluginsController.cs
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/commands.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/issue-template-check.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/commands.yml b/.github/workflows/commands.yml index 6a0d7caa2e..b43ed3ee27 100644 --- a/.github/workflows/commands.yml +++ b/.github/workflows/commands.yml @@ -45,7 +45,7 @@ jobs: repository: jellyfin/jellyfin-triage-script - name: install python - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: '3.14' cache: 'pip' diff --git a/.github/workflows/issue-template-check.yml b/.github/workflows/issue-template-check.yml index 9dec170d70..1d3294798b 100644 --- a/.github/workflows/issue-template-check.yml +++ b/.github/workflows/issue-template-check.yml @@ -15,7 +15,7 @@ jobs: repository: jellyfin/jellyfin-triage-script - name: install python - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: '3.14' cache: 'pip' |