Skip to content
Snippets Groups Projects
Commit 3148a090 authored by Muhammad Rifko Favian's avatar Muhammad Rifko Favian
Browse files

Merge branch 'dev' into 'charts'

# Conflicts:
#   app/build.gradle.kts
#   app/src/main/java/com/onionsquad/bondoman/MainActivity.kt
#   app/src/main/java/com/onionsquad/bondoman/room/TransactionDao.kt
#   app/src/main/res/values/dimens.xml
#   app/src/main/res/values/strings.xml
#   gradle/libs.versions.toml
parents 5e6bd979 0248d168
Showing
with 537 additions and 27 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