• zhang_z's avatar
    Merge remote-tracking branch 'origin/master' · d3b97de8
    zhang_z authored
    # Conflicts:
    #	.idea/caches/build_file_checksums.ser
    #	app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserInfoEditFragment.java
    #	app/src/main/res/layout/fragment_user_list.xml
    d3b97de8
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-en-xhdpi 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...
mipmap-zh-xhdpi Loading commit data...
values Loading commit data...
values-en Loading commit data...
values-v21 Loading commit data...
values-zh Loading commit data...