Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-31 01:35:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
ScottIsAFool 2013-07-27 16:42:46 +01:00
parent 03a6b86eb5 54f824b1b3
commit 9c2945b1ba
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MediaBrowser.Model/ApiClient/IApiClient.cs
View file

@ -450,11 +450,11 @@ namespace MediaBrowser.Model.ApiClient
/// <summary>
/// Authenticates a user and returns the result
/// </summary>
/// <param name="userId">The user id.</param>
/// <param name="username">The username.</param>
/// <param name="sha1Hash">The sha1 hash.</param>
/// <returns>Task.</returns>
/// <exception cref="ArgumentNullException">userId</exception>
Task AuthenticateUserAsync(string userId, byte[] sha1Hash);
Task AuthenticateUserAsync(string username, byte[] sha1Hash);
/// <summary>
/// Updates the server configuration async.

4
Nuget/MediaBrowser.Common.Internal.nuspec
View file

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>MediaBrowser.Common.Internal</id>
<version>3.0.162</version>
<version>3.0.164</version>
<title>MediaBrowser.Common.Internal</title>
<authors>Luke</authors>
<owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
<copyright>Copyright © Media Browser 2013</copyright>
<dependencies>
<dependency id="MediaBrowser.Common" version="3.0.162" />
<dependency id="MediaBrowser.Common" version="3.0.164" />
<dependency id="NLog" version="2.0.1.2" />
<dependency id="ServiceStack.Text" version="3.9.45" />
<dependency id="SimpleInjector" version="2.2.3" />

2
Nuget/MediaBrowser.Common.nuspec
View file

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>MediaBrowser.Common</id>
<version>3.0.162</version>
<version>3.0.164</version>
<title>MediaBrowser.Common</title>
<authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners>

4
Nuget/MediaBrowser.Server.Core.nuspec
View file

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Server.Core</id>
<version>3.0.162</version>
<version>3.0.164</version>
<title>Media Browser.Server.Core</title>
<authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains core components required to build plugins for Media Browser Server.</description>
<copyright>Copyright © Media Browser 2013</copyright>
<dependencies>
<dependency id="MediaBrowser.Common" version="3.0.162" />
<dependency id="MediaBrowser.Common" version="3.0.164" />
</dependencies>
</metadata>
<files>