alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-16 03:03:40 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'dev' into reformat

Browse Source 
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
#	Emby.Server.Implementations/LiveTv/LiveTvManager.cs
#	Emby.Server.Implementations/Security/MBLicenseFile.cs
#	Emby.Server.Implementations/Security/PluginSecurityManager.cs
#	Emby.Server.Implementations/Security/RegRecord.cs
#	MediaBrowser.Api/PluginService.cs
#	MediaBrowser.Api/System/SystemService.cs
#	MediaBrowser.Common/Security/IRequiresRegistration.cs
#	MediaBrowser.Common/Security/ISecurityManager.cs
#	MediaBrowser.Common/Security/PaymentRequiredException.cs
#	MediaBrowser.Model/Entities/MBRegistrationRecord.cs
#	MediaBrowser.Model/Entities/PluginSecurityInfo.cs
#	deployment/win-generic/build-jellyfin.ps1
This commit is contained in:
Erwin de Haan
2019-01-15 17:34:39 +01:00
parent 9c4239af01 99acf83dfa
commit 49b61f238e
95 changed files with 1137 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Common/Updates/IInstallationManager.cs
View File

@@ -49,9 +49,7 @@ namespace MediaBrowser.Common.Updates
/// <param name="applicationVersion">The application version.</param>
/// <returns>Task{List{PackageInfo}}.</returns>
Task<List<PackageInfo>> GetAvailablePackages(CancellationToken cancellationToken,
bool withRegistration = true,
string packageType = null,
Version applicationVersion = null);
bool withRegistration = true, string packageType = null, Version applicationVersion = null);
/// <summary>
/// Gets all available packages from a static resource.