m-im/src/main/res/values · 9083a428b85acd01c5c187be6d8578f61ac0f141 · 杨凯 / YDL-Component-Medical

Merge branch '4.2.60_lp_test' into 4.2.60

# Conflicts:
#	m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
#	m-im/src/main/res/values/colors.xml

committed Jul 02, 2021

94c76795

Name	Last commit	Last update
..
arrays.xml		Loading commit data...
attrs.xml		Loading commit data...
colors.xml		Loading commit data...
dimens.xml		Loading commit data...
ids.xml		Loading commit data...
strings.xml		Loading commit data...
styles-activity.xml		Loading commit data...
styles.xml		Loading commit data...