aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/Photo.cs
diff options
context:
space:
mode:
authorBaronGreenback <jimcartlidge@yahoo.co.uk>2020-10-11 21:30:57 +0100
committerGitHub <noreply@github.com>2020-10-11 21:30:57 +0100
commit0f47b3ec2df94ec68cbdad11fb6c8150239295ea (patch)
tree4997f97563caa2cefa949d2de4d195f7e06b4f12 /MediaBrowser.Controller/Entities/Photo.cs
parentc41ed13b3dd875498b5784f11250ae7f421d94e2 (diff)
parent2375c35c4a966a469dd97f33deb57b342498b905 (diff)
Merge branch 'master' into Comment4
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 1485d4c79..2fc66176f 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
{