m-im/src/main · 6ed85ac414a98ab4081b7baf44b252001e2eb111 · 杨凯 / YDL-Component-Medical

Merge branch 'dev' into feature/im_update · 6ed85ac4

# Conflicts:
#	config.gradle
#	m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
#	ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt

committed Jan 09, 2020

6ed85ac4

Name	Last commit	Last update
..
assets/pinyin		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...