wangcongtao c964cf780b Merge remote-tracking branch 'origin/dev' into dev ...

# Conflicts:
#	gradle.properties
#	modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png
#	modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png
#	modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png
#	modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png
#	modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
#	modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

2020-10-09 14:22:49 +08:00

..

java/com/mogo/module/common

删除无用类

2020-10-09 14:15:54 +08:00

res

Merge remote-tracking branch 'origin/dev' into dev

2020-10-09 14:22:49 +08:00

AndroidManifest.xml

dev

2019-12-24 15:49:57 +08:00