Skip to content
Snippets Groups Projects
Commit 411e1781 authored by Christophorus Dharma Winata's avatar Christophorus Dharma Winata
Browse files

Merge branch 'dev' into feat/scan 

# Conflicts:
#	app/src/main/java/pbd/tubes/exe_android/MainActivity.kt
#	app/src/main/java/pbd/tubes/exe_android/data/login/ApiService.kt
parents 82528f85 1c84ec60
2 merge requests!7Feat/scan,!6feat: edit transaction progress
Hide whitespace changes
Inline Side-by-side
Showing
with 341 additions and 46 deletions
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