• jyx's avatar
    Merge branch 'dev_tz' into dev_ad · e21a92c9
    jyx authored
    # Conflicts:
    #	GoodMoney/app/build.gradle
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ad/vedio/VedioAdingManager.java
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/CsjFullVedioAdManager.java
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/common/AppConfig.java
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/common/Constant.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/VedioRulesBean.java
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/DrawcashActivity.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MainFragment.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
    e21a92c9
Name
Last commit
Last update
..
activitys Loading commit data...
adapter Loading commit data...
fragment Loading commit data...
widgets Loading commit data...