Benoit Marty 697b9ff535 Merge branch 'develop' into feature/bca/spaces_quick_fixes		2021-05-21 14:49:12 +02:00
..
androidTest/java/im/vector/app	Implement a workaround to render <del> and <u> in the timeline (#1817)	2021-05-19 15:15:34 +02:00
debug	Small cleanup	2021-04-09 17:05:09 +02:00
fdroid	Rename parameters for clarity	2021-01-12 16:07:49 +01:00
gplay	Remove usage of GlobalScope	2021-05-14 15:26:16 +02:00
main	Merge branch 'develop' into feature/bca/spaces_quick_fixes	2021-05-21 14:49:12 +02:00
release
sharedTest/java/im/vector/app/test/shared
test/java/im/vector/app