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
..
androidTest/java/im/vector/app	Re-implement lock screen feature using our own implementation.	2022-06-20 17:38:05 +02:00
debug	Re-implement lock screen feature using our own implementation.	2022-06-20 17:38:05 +02:00
fdroid	Format project (only modified files, there are other fomatting issues).	2022-06-09 10:38:38 +02:00
gplay	Fix compilation issue	2022-06-17 17:22:31 +02:00
main	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-06-29 17:05:28 +02:00
release	Setup Flipper	2022-06-15 16:14:20 +02:00
sharedTest/java/im/vector/app/test/shared	Rename package im.vector.riotx to im.vector.app (IDE)	2020-08-03 18:46:29 +02:00
test/java/im/vector/app	Merge pull request #6356 from vector-im/fix/mna/stop-lls-from-other-device	2022-06-29 09:45:44 +02:00