ericdecanini e87d97083f Merge remote-tracking branch 'origin/develop' into bugfix/eric/upgrade-room-deduplication ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt		2022-06-29 12:02:34 +02:00
..
docs
src	Merge remote-tracking branch 'origin/develop' into bugfix/eric/upgrade-room-deduplication	2022-06-29 12:02:34 +02:00
.gitignore
build.gradle	Prepare hotfix 1.4.25	2022-06-27 14:50:05 +02:00
proguard-rules.pro