alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-03 06:18:28 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	MediaBrowser.Common/Kernel/ResourcePool.cs
This commit is contained in:
LukePulverenti
2013-03-04 00:44:04 -05:00
parent 2ca4b7d03a dccba7d1fd
commit a11e00b8d5
8 changed files with 302 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.ServerApplication/App.config
View File

@@ -15,7 +15,7 @@
<add key="ProgramDataFolderName" value="MediaBrowser-Server" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<startup>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>

2
MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs
View File

@@ -43,6 +43,7 @@ namespace MediaBrowser.ServerApplication
{
_logger = logger;
_jsonSerializer = jsonSerializer;
_libraryManager = libraryManager;
InitializeComponent();
lblVersion.Content = "Version: " + appHost.ApplicationVersion;
@@ -52,7 +53,6 @@ namespace MediaBrowser.ServerApplication
ddlProfile.SelectedIndex = 0;
ddlIndexBy.Visibility = ddlSortBy.Visibility = lblIndexBy.Visibility = lblSortBy.Visibility = Visibility.Hidden;
_libraryManager = libraryManager;
}
/// <summary>