mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-25 01:03:58 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector/src/main
History
SpiritCroc 7b4b5be759 Merge tag 'v1.0.5' into sc 
Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/values-v21/styles_login.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
	vector/src/main/res/values/theme_status.xml
2020-08-22 11:23:45 +02:00
..
assets Add missing copyright mention for PFLockScreen-Android 2020-08-18 18:21:20 +02:00
java/im/vector/app Merge tag 'v1.0.5' into sc 2020-08-22 11:23:45 +02:00
play/listings Update element web url (Fixes #1974) 2020-08-21 12:31:06 +02:00
res Merge tag 'v1.0.5' into sc 2020-08-22 11:23:45 +02:00
AndroidManifest.xml Merge tag 'v1.0.5' into sc 2020-08-22 11:23:45 +02:00