• 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
..
app Loading commit data...
gradle/wrapper Loading commit data...
shareSdkLib Loading commit data...
.gitignore Loading commit data...
build.gradle Loading commit data...
gradlew Loading commit data...
gradlew.bat Loading commit data...
settings.gradle Loading commit data...