diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-24 16:54:01 -0500 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-24 16:54:01 -0500 |
| commit | 5b1eea558a55b9a46e556b795189425441b4a026 (patch) | |
| tree | a69b73b4c8dd78a2163199d588fe6aa21ac28fb1 | |
| parent | 8ce3e74e8112a94773df22827849bf274fc88198 (diff) | |
| parent | e20e261cfbb99e4eb506db796dbbc5e02d4886e8 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Controller/Plugins/PluginSecurityManager.cs | 1 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.ApiClient.nuspec | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs b/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs index bac7c6135..9accef621 100644 --- a/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs +++ b/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs @@ -75,7 +75,6 @@ namespace MediaBrowser.Controller.Plugins /// <returns>Task{MBRegistrationRecord}.</returns> 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); } diff --git a/Nuget/MediaBrowser.ApiClient.nuspec b/Nuget/MediaBrowser.ApiClient.nuspec index 4a0f00b0e..bcb9a7d07 100644 --- a/Nuget/MediaBrowser.ApiClient.nuspec +++ b/Nuget/MediaBrowser.ApiClient.nuspec @@ -8,18 +8,17 @@ <owners>scottisafool,Luke</owners> <requireLicenseAcceptance>false</requireLicenseAcceptance> <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> - <group> - <dependency id="protobuf-net" version="2.0.0.621" /> - </group> <group targetFramework=".NETFramework4.5"> <dependency id="ServiceStack.Text" version="3.9.37" /> + <dependency id="protobuf-net" version="2.0.0.621" /> </group> <group targetFramework=".NETPortable0.0-net45+sl4+wp71+win8"> <dependency id="Newtonsoft.Json" version="4.5.11" /> <dependency id="Microsoft.Bcl.Async" version="1.0.14-rc" /> <dependency id="Microsoft.Net.Http" version="2.1.3-beta" /> + <dependency id="protobuf-net" version="2.0.0.621" /> </group> </dependencies> </metadata> |