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
..
2022-07-18 09:49:57 +02:00
2022-07-15 12:25:10 +02:00
2022-07-15 12:25:10 +02:00
2022-06-15 15:03:28 +02:00
2022-07-19 14:05:13 +02:00
2022-07-06 15:38:06 +02:00
2022-07-19 14:04:08 +02:00
2022-07-15 14:17:44 +02:00
2022-07-19 14:43:33 +02:00
2022-07-18 17:22:49 +02:00
2022-07-18 09:43:33 +02:00
2022-07-15 18:09:04 +01:00
2022-07-15 16:02:46 +01:00
2022-07-13 22:48:58 +02:00
2022-07-15 15:45:00 +03:00
2022-07-18 13:53:18 +03:00
2022-07-18 16:57:54 +02:00
2022-07-20 09:57:31 +02:00
2022-07-18 18:52:37 +03:00
2022-07-20 09:57:54 +02:00