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
..
sampledata	Add required resources.	2022-05-27 15:25:59 +03:00
src	Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773	2022-10-24 10:28:21 -04:00
.gitignore
build.gradle	Bump gradle from 7.2.2 to 7.3.1 (#7364)	2022-10-17 09:14:28 +02:00