Merge pull request #1608 from MediaBrowser/master

merge from master
9 years ago · ca2062c753
parent 38d19d4c80 fe482f3ac3
commit ca2062c753
2 changed files with 3 additions and 3 deletions
--- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
+++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
@ -76,7 +76,7 @@ namespace MediaBrowser.Server.Mac
            return list;
        }

-        public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string tempDirectory)
+		public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string applicationPath, string tempDirectory)
        {
        }

--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@ -1,4 +1,4 @@
 using System.Reflection;

-[assembly: AssemblyVersion("3.0.*")]
-//[assembly: AssemblyVersion("3.0.5910")]
+//[assembly: AssemblyVersion("3.0.*")]
+[assembly: AssemblyVersion("3.0.5911")]