Merge branch 'master' into rewrite_device_sync
This commit is contained in:
commit
cce6bbdf91
2 changed files with 2 additions and 2 deletions
|
@ -595,7 +595,7 @@ class RemoteSyncService {
|
|||
remoteDiff.localID,
|
||||
remoteDiff.fileType,
|
||||
title: remoteDiff.title,
|
||||
deviceFolder: remoteDiff.deviceFolder,
|
||||
deviceFolder: remoteDiff.deviceFolder ?? '',
|
||||
);
|
||||
if (localFileEntries.isEmpty) {
|
||||
// set remote file's localID as null because corresponding local file
|
||||
|
|
|
@ -11,7 +11,7 @@ description: ente photos application
|
|||
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
|
||||
# Read more about iOS versioning at
|
||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||
version: 0.6.34+364
|
||||
version: 0.6.35+365
|
||||
|
||||
environment:
|
||||
sdk: '>=2.12.0 <3.0.0'
|
||||
|
|
Loading…
Add table
Reference in a new issue