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

Merge branch 'feat/orientation_awareness' into feat/scan

# Conflicts:
#	app/src/main/java/pbd/tubes/exe_android/MainActivity.kt
#	app/src/main/res/layout/activity_main.xml
#	app/src/main/res/layout/transaction_list_item.xml
parents 7d3dcd43 6a34a5ef
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