Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/work-fe2-maxime-deterministic-us…
…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