fluffychat merge

pubspec.lock

@@ -1408,12 +1408,11 @@ packages:
   matrix:
     dependency: "direct main"
     description:
-      path: "."
+      name: matrix
-      ref: "krille/create-missing-object-box"
+      sha256: b96f16ec227138a61d148f2812c4d558b2930edbb6cd05d03b3a41c4fffd2f47
-      resolved-ref: f3e631b2eb477097c8fbfa188f81e6b80ee1dc58
+      url: "https://pub.dev"
-      url: "https://github.com/famedly/matrix-dart-sdk.git"
+    source: hosted
-    source: git
+    version: "0.29.7"
-    version: "0.29.2"
   meta:
     dependency: transitive
     description:

pubspec.yaml

@@ -70,10 +70,7 @@ dependencies:
   keyboard_shortcuts: ^0.1.4
   latlong2: ^0.9.1
   linkify: ^5.0.0
-  matrix:
+  matrix: ^0.29.7
-    git:
-      url: https://github.com/famedly/matrix-dart-sdk.git
-      ref: krille/create-missing-object-box
   native_imaging: ^0.1.1
   package_info_plus: ^6.0.0
   pasteboard: ^0.2.0