• 姜敏's avatar
    Merge remote-tracking branch 'origin/master' · 4a0175ec
    姜敏 authored
    # Conflicts:
    #	app/src/main/AndroidManifest.xml
    #	app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java
    #	app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
    4a0175ec
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...