SpiritCroc 95850440bd Merge remote-tracking branch 'upstream/master' into sc ... Conflicts: vector/build.gradle vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt vector/src/main/res/drawable/bg_login_server.xml vector/src/main/res/drawable/bg_login_server_checked.xml vector/src/main/res/layout/fragment_login_server_selection.xml		2020-07-17 13:39:52 +02:00
..
androidTest/java/im/vector/riotx	Fix 404 when uploading xsigning keys	2020-06-29 16:37:22 +02:00
debug	revert test code	2020-06-19 13:36:16 +02:00
fdroid	Fix lint error, following the upgrade of the libs	2020-07-06 22:05:29 +02:00
gplay	Change brand name in all strings for all languages.	2020-07-10 18:28:22 +03:00
main	Merge remote-tracking branch 'upstream/master' into sc	2020-07-17 13:39:52 +02:00
release
sharedTest/java/im/vector/riotx/test/shared	Add Android test for EmojiDataSource	2020-04-28 14:15:50 +02:00
test/java/im/vector/riotx	Fix build and add tests	2020-01-29 09:44:53 +01:00