Skip to content
Snippets Groups Projects
Commit c64d8226 authored by Bintang Hijriawan's avatar Bintang Hijriawan
Browse files

Merge branch 'feat/navbar,scan,email' into 'crud'

# Conflicts:
#   .idea/deploymentTargetDropDown.xml
#   app/build.gradle.kts
#   app/src/main/AndroidManifest.xml
#   app/src/main/java/com/example/bondoman/ContainerActivity.kt
#   app/src/main/java/com/example/bondoman/TransactionFragment.kt
#   app/src/main/java/com/example/bondoman/retrofit/adapter/TransactionAdapter.kt
#   app/src/main/java/com/example/bondoman/retrofit/data/TransactionDB.kt
#   app/src/main/java/com/example/bondoman/retrofit/data/dao/TransactionDao.kt
#   app/src/main/res/values/strings.xml
parents 48c67ec9 40048e25
3 merge requests!7Feat/chart,!6Feat/navbar,scan,email,!5Crud
Showing
with 862 additions and 352 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