xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

resolve merge conflicts for a second time due to bug in PR #829

Browse Source
This commit is contained in:
kagahd 2024-03-11 08:45:44 +01:00
parent f05ee7a867
commit a2fc61320d
No known key found for this signature in database
GPG Key ID: C7C8777FDE0053DF
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/backend/assets/sidecar/metadata.jpg.json
View File

@ -3,7 +3,7 @@
"width": 10, "width": 10,
"height": 5 "height": 5
}, },
"creationDate": 1709549328178, "creationDate": 1710142352337,
"fileSize": 4489, "fileSize": 4489,
"keywords": [ "keywords": [
"floor", "floor",

2
test/backend/assets/sidecar/no_metadata.jpg.json
View File

@ -3,7 +3,7 @@
"width": 10, "width": 10,
"height": 5 "height": 5
}, },
"creationDate": 1709549328185, "creationDate": 1710142352343,
"fileSize": 1430, "fileSize": 1430,
"keywords": [ "keywords": [
"first", "first",

2
test/backend/assets/sidecar/no_metadata_v2.jpg.json
View File

@ -3,7 +3,7 @@
"width": 10, "width": 10,
"height": 5 "height": 5
}, },
"creationDate": 1709549328188, "creationDate": 1710142352347,
"fileSize": 1430, "fileSize": 1430,
"keywords": [ "keywords": [
"first", "first",

2
test/backend/assets/sidecar/no_metadata_v3.jpg.json
View File

@ -3,7 +3,7 @@
"width": 10, "width": 10,
"height": 5 "height": 5
}, },
"creationDate": 1709549328189, "creationDate": 1710142352352,
"fileSize": 1430, "fileSize": 1430,
"keywords": [ "keywords": [
"first" "first"