Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/server-refactoring' into server-…
Browse files Browse the repository at this point in the history 
…refactoring

# Conflicts:
#	budget-binder-common/src/commonMain/kotlin/de/hsfl/budgetBinder/common/Category.kt
  • Loading branch information
@akatranlp
akatranlp committed Jun 24, 2022
2 parents 6ab0fc7 + 5628efd commit 91edfa2
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 91edfa2

Please sign in to comment.