Merge pull request #1993 from MediaBrowser/master

merge from master
8 years ago · 8d4ffda405
parent f238005d2b 06b0cfb86f
commit 8d4ffda405
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")]