Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/work-fe2-maxime-deterministic-us…
Browse files Browse the repository at this point in the history
…ername' into work-fe2-maxime-deterministic-username

# Conflicts:
#	fe2-android/app/src/main/java/com/github/dedis/popstellar/model/objects/security/PublicKey.kt
#	fe2-android/app/src/main/java/com/github/dedis/popstellar/ui/lao/digitalcash/DigitalCashIssueFragment.kt
#	fe2-android/app/src/main/java/com/github/dedis/popstellar/ui/lao/digitalcash/DigitalCashSendFragment.kt
  • Loading branch information
Kaz-ookid committed Jun 27, 2024
2 parents 432a370 + 9ef49f1 commit ee37ad4
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit ee37ad4

Please sign in to comment.