SchildiChat-android/vector
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 Room profile: make link in room topic clickable 2020-01-16 16:36:56 +01:00
signature Share the debug signature to all machines which build the debug APK 2019-06-07 10:17:14 +02:00
src Merge remote-tracking branch 'upstream/master' into sc 2020-07-17 13:39:52 +02:00
.gitignore Rename app to vector 2019-04-02 11:24:54 +02:00
build.gradle Merge remote-tracking branch 'upstream/master' into sc 2020-07-17 13:39:52 +02:00
lint.xml Try to remove rule that is breaking CI 2020-03-11 11:19:22 +01:00
proguard-rules.pro Add proguard command (commented) 2020-07-02 22:02:42 +02:00