ericdecanini e6addd1319 Merge remote-tracking branch 'origin/develop' into task/eric/space-switching-unit-tests ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt		2022-07-28 11:25:14 +02:00
..
androidTest/java/im/vector/app	Merge pull request #6651 from vector-im/feature/adm/enable-ftue	2022-07-27 16:38:35 +01:00
debug	Start SDK before handling permalink or sharing to the app.	2022-07-21 11:19:36 +02:00
fdroid	Change name of fun.	2022-07-26 17:47:49 +02:00
gplay	Change name of fun.	2022-07-26 17:47:49 +02:00
main	Merge remote-tracking branch 'origin/develop' into task/eric/space-switching-unit-tests	2022-07-28 11:25:14 +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	Rename package im.vector.riotx to im.vector.app (IDE)	2020-08-03 18:46:29 +02:00
test/java	Merge remote-tracking branch 'origin/develop' into task/eric/space-switching-unit-tests	2022-07-28 11:25:14 +02:00