SchildiChat-android/vector
SpiritCroc 8cf2a51588 Merge tag 'v0.21.0' into sc
Conflicts:
	vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
2020-06-05 16:28:18 +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 tag 'v0.21.0' into sc 2020-06-05 16:28:18 +02:00
.gitignore Rename app to vector 2019-04-02 11:24:54 +02:00
build.gradle Merge tag 'v0.21.0' into sc 2020-06-05 16:28:18 +02:00
lint.xml Try to remove rule that is breaking CI 2020-03-11 11:19:22 +01:00
proguard-rules.pro Rename app to vector 2019-04-02 11:24:54 +02:00