diff options
| author | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-11 12:50:36 +0100 |
|---|---|---|
| committer | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-11 12:50:36 +0100 |
| commit | e2751d42e8775596b7c4b929fd004d879f980947 (patch) | |
| tree | da1d6e703abbb6a47cd64730603f06dc4b51df8f /MediaBrowser.Controller/Library | |
| parent | ec1f5dc317182582ebff843c9e8a4d5277405469 (diff) | |
| parent | e5c2dbdf23267006ef151d6ee8ab1cea147123d7 (diff) | |
Merge branch 'dev' into code-cleanup
Diffstat (limited to 'MediaBrowser.Controller/Library')
| -rw-r--r-- | MediaBrowser.Controller/Library/IUserManager.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/ItemResolveArgs.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/TVUtils.cs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs index d29b164ef..154ef3b05 100644 --- a/MediaBrowser.Controller/Library/IUserManager.cs +++ b/MediaBrowser.Controller/Library/IUserManager.cs @@ -123,7 +123,7 @@ namespace MediaBrowser.Controller.Library /// <param name="user">The user.</param> /// <returns>Task.</returns> void ResetEasyPassword(User user); - + /// <summary> /// Changes the password. /// </summary> @@ -133,7 +133,7 @@ namespace MediaBrowser.Controller.Library /// Changes the easy password. /// </summary> void ChangeEasyPassword(User user, string newPassword, string newPasswordSha1); - + /// <summary> /// Gets the user dto. /// </summary> diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs index f2c117371..387540b81 100644 --- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs +++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs @@ -126,7 +126,7 @@ namespace MediaBrowser.Controller.Library { var item = parent as T; - // Just in case the user decided to nest episodes. + // Just in case the user decided to nest episodes. // Not officially supported but in some cases we can handle it. if (item == null) { diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs index dc95ba112..162ebc75e 100644 --- a/MediaBrowser.Controller/Library/TVUtils.cs +++ b/MediaBrowser.Controller/Library/TVUtils.cs @@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.Library /// <summary> /// The TVDB API key /// </summary> - public static readonly string TvdbApiKey = "B89CE93890E9419B"; + public static readonly string TvdbApiKey = "OG4V3YJ3FAP7FP2K"; public static readonly string TvdbBaseUrl = "https://www.thetvdb.com/"; /// <summary> /// The banner URL |