Skip to content
Snippets Groups Projects
Commit 6f5e3f4c authored by Hosea Nathanael Abetnego's avatar Hosea Nathanael Abetnego
Browse files

Merge branch 'dev' into 'feat/scanner' 

# Conflicts:
#   app/src/main/java/com/example/abe/data/network/Retrofit.kt
#   app/src/main/java/com/example/abe/data/network/Services.kt
#   app/src/main/java/com/example/abe/data/network/Types.kt
#   app/src/main/java/com/example/abe/ui/login/LoginActivity.kt
parents 097b05a2 fa515bf4
Hide whitespace changes
Inline Side-by-side
Showing
with 314 additions and 40 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