Merge branch 'master' into rewrite_device_sync

This commit is contained in:
Neeraj Gupta 2022-09-26 17:48:56 +05:30
commit cce6bbdf91
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
2 changed files with 2 additions and 2 deletions

View file

@ -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

View 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'