ericdecanini 35be56a44a Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773 ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt		2022-10-24 10:28:21 -04:00
..
docs
src	Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773	2022-10-24 10:28:21 -04:00
.gitignore
build.gradle
proguard-rules.pro