Merge remote-tracking branch 'origin/scan_nota' into scan_nota
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/res/drawable/iv_picture.xml
Please register or sign in to comment
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/res/drawable/iv_picture.xml