mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-24 23:09:02 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/library/ui-styles/src
History
SpiritCroc c03c6867f7 Merge branch 'merge-v1.3.8' into sc 
Change-Id: If000613462f3cd3b73c8de24f456dccc16fcde38

Conflicts:
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
2021-11-17 20:26:27 +01:00
..
debug Merge pull request #3549 from vector-im/feature/bma/cleanup_styles 2021-06-25 19:11:54 +02:00
main Merge branch 'merge-v1.3.8' into sc 2021-11-17 20:26:27 +01:00
release/res/values Move test style Activity and layout to the new ui-style module 2021-06-15 18:17:36 +02:00