diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-01-21 13:28:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 13:28:40 -0500 |
| commit | 571afa4fe2322796e172ce5b7214a18ff52696da (patch) | |
| tree | 8f5ffc29b3e0f6827bb76630acf5bcd02fdd0d7a /deployment | |
| parent | 42f2799d66578707dc30ceefcc39efddb4daeb99 (diff) | |
| parent | 384f867228cc38d6e9eeedc16f14af7345df220c (diff) | |
Merge pull request #655 from joshuaboniface/local-web-branch
Support trying local branches in submodule
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/debian-package-x64/pkg-src/changelog | 1 | ||||
| -rw-r--r-- | deployment/fedora-package-x64/pkg-src/jellyfin.spec | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/deployment/debian-package-x64/pkg-src/changelog b/deployment/debian-package-x64/pkg-src/changelog index 720040784..8670bac45 100644 --- a/deployment/debian-package-x64/pkg-src/changelog +++ b/deployment/debian-package-x64/pkg-src/changelog @@ -45,6 +45,7 @@ jellyfin (10.1.0-1) unstable; urgency=medium * PR638 Removed XmlTv testfiles and nuget install * PR639 Fix segment_time_delta for ffmpeg 4.1 * PR646: Fix infinite loop bug on subtitle.m3u8 request + * PR655: Support trying local branches in submodule * jellyfin-web: * PR1: Change webcomponents to non-minified version * PR4: Fix user profile regression diff --git a/deployment/fedora-package-x64/pkg-src/jellyfin.spec b/deployment/fedora-package-x64/pkg-src/jellyfin.spec index 28907b3d6..4afe01718 100644 --- a/deployment/fedora-package-x64/pkg-src/jellyfin.spec +++ b/deployment/fedora-package-x64/pkg-src/jellyfin.spec @@ -181,6 +181,7 @@ fi - PR638 Removed XmlTv testfiles and nuget install - PR639 Fix segment_time_delta for ffmpeg 4.1 - PR646: Fix infinite loop bug on subtitle.m3u8 request +- PR655: Support trying local branches in submodule - jellyfin-web: - PR1: Change webcomponents to non-minified version - PR4: Fix user profile regression |