diff options
| author | Joshua Boniface <joshua@boniface.me> | 2019-01-15 22:29:22 -0500 |
|---|---|---|
| committer | Joshua Boniface <joshua@boniface.me> | 2019-01-15 22:29:22 -0500 |
| commit | b30d70278288d516366651dc1f97403d1a4b71a5 (patch) | |
| tree | 216b16944df601d5f1cc89b014e3951207c98de9 | |
| parent | 99acf83dfafedd3f426cf3ddf0de8bf58cdea86d (diff) | |
| parent | 27f0633ed82228127ddaab2bd5eb8b844a2c8ed6 (diff) | |
Merge branch 'master' into dev
| -rw-r--r-- | SharedVersion.cs | 4 | ||||
| -rw-r--r-- | deployment/debian-package-x64/pkg-src/changelog | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index 07026f70a..a29381f63 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("10.0.1")] -[assembly: AssemblyFileVersion("10.0.1")] +[assembly: AssemblyVersion("10.0.2")] +[assembly: AssemblyFileVersion("10.0.2")] diff --git a/deployment/debian-package-x64/pkg-src/changelog b/deployment/debian-package-x64/pkg-src/changelog index 685d31a5e..f7a1994b7 100644 --- a/deployment/debian-package-x64/pkg-src/changelog +++ b/deployment/debian-package-x64/pkg-src/changelog @@ -1,3 +1,11 @@ +jellyfin (10.0.2-1) unstable; urgency=medium + + * Hotfix release + * jellyfin/jellyfin-web#23: Update Chromecast app ID [via direct commit] + * #540: Update Emby API keys to our own + * #541: Change ItemId to Guid in ProviderManager + * #566: Avoid printing stacktrace when bind to port 1900 fails + jellyfin (10.0.1-1) unstable; urgency=medium * Hotfix release, corrects several small bugs from 10.0.0 |