ericdecanini e926871570 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		2022-07-19 11:17:14 +02:00
..
assets	Try to communicate with WidgetPostAPI	2020-05-13 20:04:08 +02:00
java/org	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-19 11:17:14 +02:00
res	Import sas strings	2021-06-18 10:25:37 +02:00
AndroidManifest.xml	Fix warning	2021-09-02 09:43:39 +02:00