alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 09:04:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source 
Conflicts:
	Nuget/MediaBrowser.ApiClient.nuspec
This commit is contained in:
LukePulverenti
2013-02-25 22:43:56 -05:00
parent 2d06095447 59ce944478
commit efdb2f3990
27 changed files with 735 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Server.Implementations/ServerApplicationPaths.cs
View File

@@ -17,7 +17,7 @@ namespace MediaBrowser.Server.Implementations
: base(true)
{
}
#elif (RELEASE)
#else
public ServerApplicationPaths()
: base(false)
{