• shiyl's avatar
    Merge branch 'dev' into dev_commodity · b2ae28dc
    shiyl authored
    # Conflicts:
    #	.gitignore
    #	CommonLib/Common/src/main/java/com/yidian/common/YdBaseApplication.kt
    #	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt
    #	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/FlashActivity.kt
    #	app/build.gradle
    #	app/src/main/AndroidManifest.xml
    #	app/src/main/java/com/shenghuoquan/business/YdSubwayApplication.kt
    #	idcard_quality/src/main/AndroidManifest.xml
    b2ae28dc
Name
Last commit
Last update
..
attrs.xml Loading commit data...
colors.xml Loading commit data...
dimens.xml Loading commit data...
strings.xml Loading commit data...
styles.xml Loading commit data...