mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-30 21:08:40 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector/src/gplay
History
SpiritCroc 6c06462ec9 Merge tag 'v1.1.8' into sc 
Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
2021-05-26 10:44:19 +02:00
..
debug Adapt google-services.json package ids 2020-08-09 13:39:12 +02:00
java/im/vector/app Remove usage of GlobalScope 2021-05-14 15:26:16 +02:00
release Adapt google-services.json package ids 2020-08-09 13:39:12 +02:00
AndroidManifest.xml Rename package im.vector.riotx to im.vector.app (IDE) 2020-08-03 18:46:29 +02:00