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

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

1 files changed, 10 insertions, 0 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>