ericdecanini 9350053214 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/RealmSessionStoreMigration.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo030.kt		2022-06-29 17:05:28 +02:00
..
docs	Package have been renamed, so also rename it here.	2022-05-20 21:14:42 +02:00
src	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-06-29 17:05:28 +02:00
.gitignore
build.gradle	Prepare hotfix 1.4.25	2022-06-27 14:50:05 +02:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00