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

Merge remote-tracking branch 'origin/4.2.60_lp_test' into 4.2.60_lp_test · d6ce4af1

# Conflicts:
#	m-im/src/main/java/com/yidianling/uikit/business/session/view/QuestionInformationView.kt
#	m-im/src/main/res_uikit/layout/im_view_question_infomation.xml

committed Jun 25, 2021

d6ce4af1

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...