Merge branch 'master' into dev

6 years ago · b30d702782
parent 99acf83dfa 27f0633ed8
commit b30d702782
2 changed files with 10 additions and 2 deletions
--- 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")]
--- 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