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
..
androidTest/java/im/vector/app	font scale setting screen (#6453)	2022-07-18 09:49:57 +02:00
debug	Changes vector override to vector feature	2022-07-19 10:43:55 +02:00
fdroid	Rename Android Service to use AndroidService suffix to limit confusion with our Matrix SDK Services	2022-07-04 21:39:01 +02:00
gplay	Add google-services.json for nightly builds	2022-07-05 16:09:18 +02:00
main	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-20 16:44:33 +02:00
nightly/res/xml	Add sources for nightly. Use release version, change AnalyticsConfig.kt and shortcuts.xml.	2022-07-06 15:37:21 +02:00
release	Add sources for nightly. Use release version, change AnalyticsConfig.kt and shortcuts.xml.	2022-07-06 15:37:21 +02:00
sharedTest/java/im/vector/app/test/shared
test/java	Merge pull request #6200 from vector-im/bugfix/eric/upgrade-room-deduplication	2022-07-20 12:30:42 +02:00