SchildiChat-android/library/ui-styles/src
SpiritCroc 87eaf85224 Security patch v1.5.1
Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt

Change-Id: I0c8f5e098f92d0bf42e5ddc41bb6ad43c69bfdd2
2022-09-28 10:41:00 +02:00
..
debug Merge tag 'v1.4.36' into merge-v1.4.36 2022-09-10 15:24:40 +02:00
main Security patch v1.5.1 2022-09-28 10:41:00 +02:00
release/res/values Move test style Activity and layout to the new ui-style module 2021-06-15 18:17:36 +02:00