mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
5b1eea558a
2 changed files with 3 additions and 5 deletions
|
@ -75,7 +75,6 @@ namespace MediaBrowser.Controller.Plugins
|
||||||
/// <returns>Task{MBRegistrationRecord}.</returns>
|
/// <returns>Task{MBRegistrationRecord}.</returns>
|
||||||
public async Task<MBRegistrationRecord> GetRegistrationStatus(string feature, string mb2Equivalent = null)
|
public async Task<MBRegistrationRecord> GetRegistrationStatus(string feature, string mb2Equivalent = null)
|
||||||
{
|
{
|
||||||
// Update this method to add _networkManager as a param.
|
|
||||||
return await MBRegistration.GetRegistrationStatus(feature, mb2Equivalent).ConfigureAwait(false);
|
return await MBRegistration.GetRegistrationStatus(feature, mb2Equivalent).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,18 +8,17 @@
|
||||||
<owners>scottisafool,Luke</owners>
|
<owners>scottisafool,Luke</owners>
|
||||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||||
<description>ApiClient allows .NET clients to easily access the Media Browser 3 web API</description>
|
<description>ApiClient allows .NET clients to easily access the Media Browser 3 web API</description>
|
||||||
<copyright>Copyright © 2013</copyright>
|
<copyright>Copyright © Media Browser 2013</copyright>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<group>
|
|
||||||
<dependency id="protobuf-net" version="2.0.0.621" />
|
|
||||||
</group>
|
|
||||||
<group targetFramework=".NETFramework4.5">
|
<group targetFramework=".NETFramework4.5">
|
||||||
<dependency id="ServiceStack.Text" version="3.9.37" />
|
<dependency id="ServiceStack.Text" version="3.9.37" />
|
||||||
|
<dependency id="protobuf-net" version="2.0.0.621" />
|
||||||
</group>
|
</group>
|
||||||
<group targetFramework=".NETPortable0.0-net45+sl4+wp71+win8">
|
<group targetFramework=".NETPortable0.0-net45+sl4+wp71+win8">
|
||||||
<dependency id="Newtonsoft.Json" version="4.5.11" />
|
<dependency id="Newtonsoft.Json" version="4.5.11" />
|
||||||
<dependency id="Microsoft.Bcl.Async" version="1.0.14-rc" />
|
<dependency id="Microsoft.Bcl.Async" version="1.0.14-rc" />
|
||||||
<dependency id="Microsoft.Net.Http" version="2.1.3-beta" />
|
<dependency id="Microsoft.Net.Http" version="2.1.3-beta" />
|
||||||
|
<dependency id="protobuf-net" version="2.0.0.621" />
|
||||||
</group>
|
</group>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|
Loading…
Reference in a new issue