Onuray Sahin 2e2dffd9c9 Merge branch 'develop' into live_location_labs_flag ... * develop: Space explore rooms screen alignment with design in figma (#5834) leaving space aligned with ios (#5942) Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.		2022-05-19 12:52:05 +03:00
..
androidTest/java/im/vector/app	leaving space aligned with ios (#5942)	2022-05-19 11:49:08 +02:00
debug	Labs flag added for enabling live location sharing.	2022-05-19 12:01:42 +03:00
fdroid	Merge pull request #5941 from vector-im/feature/bma/konfetti_speed	2022-05-09 17:05:53 +02:00
gplay	Ah it was used in Gplay variant. Anyway I think we can still remove this now.	2022-05-18 15:05:23 +02:00
main	Merge branch 'develop' into live_location_labs_flag	2022-05-19 12:52:05 +03:00
release	Lifting debug overrides to their own abstraction (#5361)	2022-03-02 10:08:43 +00:00
sharedTest/java/im/vector/app/test/shared
test/java/im/vector/app	Rename 'getDomain' to 'getServerName'.	2022-05-18 15:21:33 +01:00