-
前置信息页消息集成完毕，发送70、71类型消息未进行 · 94c76795Merge 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
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