Merge branch 'master' into 'development'

# Conflicts: # Package.swift # client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved

Merge branch 'master' into 'development'
62f1af47 · Bruno Muniz · e144e690 · 765f4875 · 62f1af47
Commit 62f1af47 authored 2 years ago by Bruno Muniz
--- a/client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -167,8 +167,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/groue/GRDB.swift",
      "state" : {
-        "revision" : "e02f2c8abacff2799ed14926edcbf6e76fb9f805",
-        "version" : "5.25.0"
+        "revision" : "23f4254ae36fa19aecd73047c0577a9f49850d1c",
+        "version" : "5.26.0"
      }
    },
    {