Merge branch 'master' into rewrite_device_sync

lib/services/remote_sync_service.dart

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

pubspec.yaml

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