Skip to content
Snippets Groups Projects
Commit 2a78a7ab authored by Muhhamad  Syauqi's avatar Muhhamad Syauqi
Browse files

Merge remote-tracking branch 'origin/scan_nota' into scan_nota

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/drawable/iv_picture.xml
parents e9a41340 75b0de3c
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment