aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/Photo.cs
diff options
context:
space:
mode:
authorBaronGreenback <jimcartlidge@yahoo.co.uk>2020-10-17 15:00:43 +0100
committerGitHub <noreply@github.com>2020-10-17 15:00:43 +0100
commit63be65dd919f1e628452c64f0fae7a7f035bce96 (patch)
tree8bf19d708cef1f5667ec938ab704859b223d0d97 /MediaBrowser.Controller/Entities/Photo.cs
parent68de105dc21f4d1114a3b1db81f177caae747ef6 (diff)
parent49ac4c4044b1777dc3a25544aead7b0b15b953e8 (diff)
Merge branch 'master' into Comment1
Diffstat (limited to 'MediaBrowser.Controller/Entities/Photo.cs')
-rw-r--r--MediaBrowser.Controller/Entities/Photo.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/Photo.cs b/MediaBrowser.Controller/Entities/Photo.cs
index 1485d4c792..2fc66176f6 100644
--- a/MediaBrowser.Controller/Entities/Photo.cs
+++ b/MediaBrowser.Controller/Entities/Photo.cs
@@ -16,7 +16,6 @@ namespace MediaBrowser.Controller.Entities
[JsonIgnore]
public override Folder LatestItemsIndexContainer => AlbumEntity;
-
[JsonIgnore]
public PhotoAlbum AlbumEntity
{