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

Merge branch 'dev' into feature/组件化_ending · 9f789df6

# Conflicts:
#	app/src/main/java/com/ydl/component/MainActivity.kt
#	m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/fragment/PublishQuestionAndTrendFragment.java
#	ydl-platform/src/main/java/com/ydl/ydlcommon/utils/log/LogHelper.kt
#	ydl-platform/src/main/java/com/ydl/ydlcommon/view/banner/GlideImageDisplayLoader.java

committed Feb 22, 2020

9f789df6

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