ericdecanini a5536ab894 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt		2022-08-25 16:15:53 +02:00
..
androidTest/java/im/vector/app	Fix broken unit test on emoji search	2022-08-18 09:48:51 +02:00
debug	Use @AndroidEntryPoint for all Fragment	2022-08-23 18:49:16 +02:00
fdroid	using american english for consistency	2022-08-11 09:32:36 +01:00
gplay	using american english for consistency	2022-08-11 09:32:36 +01:00
main	Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation	2022-08-25 16:15:53 +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	Merge pull request #6792 from vector-im/feature/mna/enable-leakcanary	2022-08-11 12:10:26 +02:00
sharedTest/java/im/vector/app/test/shared
test/java	Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation	2022-08-24 20:25:02 +02:00