Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

9 years ago · 5eb4cb87f5
parent f593230e44 8d4ffda405
commit 5eb4cb87f5
2 changed files with 379 additions and 2683 deletions
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@ -1,4 +1,4 @@
 using System.Reflection;

-[assembly: AssemblyVersion("3.1.*")]
-//[assembly: AssemblyVersion("3.0.5986")]
+//[assembly: AssemblyVersion("3.1.*")]
+[assembly: AssemblyVersion("3.1.80")]