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

..

sampledata

…

signature

…

src

Merge remote-tracking branch 'upstream/master' into sc

2020-07-17 13:39:52 +02:00

.gitignore

…

build.gradle

Merge remote-tracking branch 'upstream/master' into sc

2020-07-17 13:39:52 +02:00

lint.xml

…

proguard-rules.pro

Add proguard command (commented)

2020-07-02 22:02:42 +02:00