ericdecanini ee941cf88d 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/MigrateSessionTo033.kt		2022-07-20 10:56:07 +02:00
..
docs
src	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-20 10:56:07 +02:00
.gitignore
build.gradle	Version++	2022-07-13 12:46:32 +02:00
proguard-rules.pro