ericdecanini 9e1235d51f Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo034.kt		2022-07-20 16:44:33 +02:00
..
sampledata
signature	Setup nightly buildType	2022-07-05 16:07:12 +02:00
src	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-20 16:44:33 +02:00
.gitignore
build.gradle	Bump libphonenumber from 8.12.51 to 8.12.52	2022-07-19 23:06:00 +00:00
lint.xml
proguard-rules.pro