cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 10:29:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1608 from MediaBrowser/master

Browse Source 
merge from master
This commit is contained in:
Luke 2016-03-27 23:39:00 -04:00
commit ca2062c753
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
View File

@ -76,7 +76,7 @@ namespace MediaBrowser.Server.Mac
return list; 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)
{ {
} }

4
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.0.*")] //[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5910")] [assembly: AssemblyVersion("3.0.5911")]