mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-24 00:34:01 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector/src/main
History
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
..
assets Uniform emoji representation for all platform 2020-04-10 11:02:33 +02:00
java/im/vector/riotx Merge tag 'v0.21.0' into sc 2020-06-05 16:28:18 +02:00
res Merge tag 'v0.21.0' into sc 2020-06-05 16:28:18 +02:00
AndroidManifest.xml Merge tag 'v0.21.0' into sc 2020-06-05 16:28:18 +02:00