Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio

# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs

1 files changed, 6 insertions, 0 deletions

diff --git a/MediaBrowser.Model/Users/UserAction.cs b/MediaBrowser.Model/Users/UserAction.cs
index 36b8e6ee5..7646db4a8 100644
--- a/MediaBrowser.Model/Users/UserAction.cs
+++ b/MediaBrowser.Model/Users/UserAction.cs
@@ -8,11 +8,17 @@ namespace MediaBrowser.Model.Users
     public class UserAction
     {
         public string Id { get; set; }
+
         public string ServerId { get; set; }
+
         public Guid UserId { get; set; }
+
         public Guid ItemId { get; set; }
+
         public UserActionType Type { get; set; }
+
         public DateTime Date { get; set; }
+
         public long? PositionTicks { get; set; }
     }
 }