ganfra d707ad1c27 Merge branch 'develop' into feature/fga/live_location_sharing_setup ... # Conflicts: # tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en.png # tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en.png # tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_8_en.png # tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_8_en.png		2026-03-24 11:23:50 +01:00
..
src/test	Merge branch 'develop' into feature/fga/live_location_sharing_setup	2026-03-24 11:23:50 +01:00
.gitignore
build.gradle.kts
consumer-rules.pro