Merge branch 'master' into studios-images-plugin

# Conflicts:
#	MediaBrowser.Providers/MediaBrowser.Providers.csproj

1 files changed, 0 insertions, 24 deletions

diff --git a/MediaBrowser.Model/Users/UserAction.cs b/MediaBrowser.Model/Users/UserAction.cs
deleted file mode 100644
index 7646db4a8..000000000
--- a/MediaBrowser.Model/Users/UserAction.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-using System;
-
-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; }
-    }
-}