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

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

3 files changed, 18 insertions, 1 deletions

diff --git a/MediaBrowser.Model/SyncPlay/GroupUpdateType.cs b/MediaBrowser.Model/SyncPlay/GroupUpdateType.cs
index 89d245787..c749f7b13 100644
--- a/MediaBrowser.Model/SyncPlay/GroupUpdateType.cs
+++ b/MediaBrowser.Model/SyncPlay/GroupUpdateType.cs
@@ -9,42 +9,52 @@ namespace MediaBrowser.Model.SyncPlay
         /// The user-joined update. Tells members of a group about a new user.
         /// </summary>
         UserJoined,
+
         /// <summary>
         /// The user-left update. Tells members of a group that a user left.
         /// </summary>
         UserLeft,
+
         /// <summary>
         /// The group-joined update. Tells a user that the group has been joined.
         /// </summary>
         GroupJoined,
+
         /// <summary>
         /// The group-left update. Tells a user that the group has been left.
         /// </summary>
         GroupLeft,
+
         /// <summary>
         /// The group-wait update. Tells members of the group that a user is buffering.
         /// </summary>
         GroupWait,
+
         /// <summary>
         /// The prepare-session update. Tells a user to load some content.
         /// </summary>
         PrepareSession,
+
         /// <summary>
         /// The not-in-group error. Tells a user that they don't belong to a group.
         /// </summary>
         NotInGroup,
+
         /// <summary>
         /// The group-does-not-exist error. Sent when trying to join a non-existing group.
         /// </summary>
         GroupDoesNotExist,
+
         /// <summary>
         /// The create-group-denied error. Sent when a user tries to create a group without required permissions.
         /// </summary>
         CreateGroupDenied,
+
         /// <summary>
         /// The join-group-denied error. Sent when a user tries to join a group without required permissions.
         /// </summary>
         JoinGroupDenied,
+
         /// <summary>
         /// The library-access-denied error. Sent when a user tries to join a group without required access to the library.
         /// </summary>
diff --git a/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs b/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
index f1e175fde..671f4e01f 100644
--- a/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
+++ b/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
@@ -1,7 +1,7 @@
 namespace MediaBrowser.Model.SyncPlay
 {
     /// <summary>
-    /// Enum PlaybackRequestType
+    /// Enum PlaybackRequestType.
     /// </summary>
     public enum PlaybackRequestType
     {
@@ -9,22 +9,27 @@ namespace MediaBrowser.Model.SyncPlay
         /// A user is requesting a play command for the group.
         /// </summary>
         Play = 0,
+
         /// <summary>
         /// A user is requesting a pause command for the group.
         /// </summary>
         Pause = 1,
+
         /// <summary>
         /// A user is requesting a seek command for the group.
         /// </summary>
         Seek = 2,
+
         /// <summary>
         /// A user is signaling that playback is buffering.
         /// </summary>
         Buffering = 3,
+
         /// <summary>
         /// A user is signaling that playback resumed.
         /// </summary>
         BufferingDone = 4,
+
         /// <summary>
         /// A user is reporting its ping.
         /// </summary>
diff --git a/MediaBrowser.Model/SyncPlay/SendCommandType.cs b/MediaBrowser.Model/SyncPlay/SendCommandType.cs
index 113719871..86dec9e90 100644
--- a/MediaBrowser.Model/SyncPlay/SendCommandType.cs
+++ b/MediaBrowser.Model/SyncPlay/SendCommandType.cs
@@ -9,10 +9,12 @@ namespace MediaBrowser.Model.SyncPlay
         /// The play command. Instructs users to start playback.
         /// </summary>
         Play = 0,
+
         /// <summary>
         /// The pause command. Instructs users to pause playback.
         /// </summary>
         Pause = 1,
+
         /// <summary>
         /// The seek command. Instructs users to seek to a specified time.
         /// </summary>