Merge pull request #252 from ente-io/master

release
This commit is contained in:
Vishnu Mohandas 2021-11-26 18:30:28 +05:30 committed by GitHub
commit 3ff53d129b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions

View file

@ -152,6 +152,8 @@ const PhotoFrame = ({
.map((item, index) => ({
...item,
dataIndex: index,
w: window.innerWidth,
h: window.innerHeight,
...(item.deleteBy && {
title: constants.AUTOMATIC_BIN_DELETE_MESSAGE(
formatDateRelative(item.deleteBy / 1000)

@ -1 +1 @@
Subproject commit 443b1e393aa37899373b71272e4bcf191529bb74
Subproject commit b1766d38475659c17cf669e2b27787d15f8957b1

View file

@ -5048,7 +5048,7 @@ peek-readable@^4.0.1:
integrity sha512-7qmhptnR0WMSpxT5rMHG9bW/mYSR1uqaPFj2MHvT+y/aOUu6msJijpKt5SkTDKySwg65OWG2JwTMBlgcbwMHrQ==
"photoswipe@file:./thirdparty/photoswipe":
version "4.1.3"
version "4.1.4"
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3:
version "2.3.0"