ericdecanini c73c36eb26 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/MigrateSessionTo032.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt		2022-07-18 15:05:04 +02:00
..
androidTest	fix unused import	2022-07-15 14:18:35 +02:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Formats entire project	2022-04-21 11:50:15 +02:00
main	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-18 15:05:04 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Formats entire project	2022-04-21 11:50:15 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared	Fix Copyright mention in SDK code	2020-10-08 15:04:55 +02:00
test/java/org/matrix/android/sdk	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-18 15:03:42 +02:00