Merge branch 'master' into check-stored-password-exists

# Conflicts:
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs

3 files changed, 7 insertions, 4 deletions

diff --git a/MediaBrowser.Model/Entities/ImageType.cs b/MediaBrowser.Model/Entities/ImageType.cs
index d89a4b3ad..6ea9ee419 100644
--- a/MediaBrowser.Model/Entities/ImageType.cs
+++ b/MediaBrowser.Model/Entities/ImageType.cs
@@ -63,6 +63,11 @@ namespace MediaBrowser.Model.Entities
         /// <summary>
         /// The box rear.
         /// </summary>
-        BoxRear = 11
+        BoxRear = 11,
+
+        /// <summary>
+        /// The user profile image.
+        /// </summary>
+        Profile = 12
     }
 }
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index fa09cc513..3db72f78a 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -114,7 +114,7 @@ namespace MediaBrowser.Model.Entities
             {
                 if (Type == MediaStreamType.Audio)
                 {
-                    //if (!string.IsNullOrEmpty(Title))
+                    // if (!string.IsNullOrEmpty(Title))
                     //{
                     //    return AddLanguageIfNeeded(Title);
                     //}
@@ -208,7 +208,6 @@ namespace MediaBrowser.Model.Entities
 
                 if (Type == MediaStreamType.Video)
                 {
-
                 }
 
                 return null;
diff --git a/MediaBrowser.Model/Entities/PackageReviewInfo.cs b/MediaBrowser.Model/Entities/PackageReviewInfo.cs
index 1ebbc3323..5b22b34ac 100644
--- a/MediaBrowser.Model/Entities/PackageReviewInfo.cs
+++ b/MediaBrowser.Model/Entities/PackageReviewInfo.cs
@@ -36,6 +36,5 @@ namespace MediaBrowser.Model.Entities
         /// Gets or sets the time of review.
         /// </summary>
         public DateTime timestamp { get; set; }
-
     }
 }