m-im/src/main · 94c767951cfd94ca5d3692e93204b1574ff5dcd3 · 杨凯 / 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
..
assets		Loading commit data...
java/com/yidianling		Loading commit data...
modular_api/com/yidianling/im/api		Loading commit data...
res		Loading commit data...
res_avchat		Loading commit data...
res_uikit		Loading commit data...
AndroidManifest.xml		Loading commit data...