• 王海's avatar
    Merge remote-tracking branch 'origin/master' · 2407b06f
    王海 authored
    # Conflicts:
    #	app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
    #	app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java
    #	app/src/main/res/layout/fragment_bale_seach.xml
    #	app/src/main/res/layout/fragment_bale_seach_shop.xml
    2407b06f
Name
Last commit
Last update
..
drawable Loading commit data...
drawable-v24 Loading commit data...
layout Loading commit data...
mipmap-anydpi-v26 Loading commit data...
mipmap-hdpi Loading commit data...
mipmap-mdpi Loading commit data...
mipmap-xhdpi Loading commit data...
mipmap-xxhdpi Loading commit data...
mipmap-xxxhdpi Loading commit data...
values Loading commit data...
values-v21 Loading commit data...