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
..
java/org/matrix/android/sdk	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-20 16:44:33 +02:00
AndroidManifest.xml	Handle change from WorkManager 2.6.0.	2021-09-30 12:06:57 +02:00