fluffychat merge - resolve conflicts

This commit is contained in:
ggurdin 2024-09-04 15:56:11 -04:00
commit 468f906de6
No known key found for this signature in database
GPG key ID: A01CB41737CBB478

View file

@ -75,7 +75,7 @@ dependencies:
git:
url: https://github.com/pangeachat/matrix-dart-sdk.git # repo
ref: main # branch
# matrix: ^0.31.0
# matrix: ^0.32.0
# Pangea#
native_imaging: ^0.1.1
opus_caf_converter_dart: ^1.0.1