Skip to content

Commit

Permalink
Merge branch 'develop' into feature/subintent-hash-at-device-side
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cargo.lock
  • Loading branch information
siy committed Nov 1, 2024
2 parents c89fb72 + b68b995 commit 157e4a3
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ This repository follows quite traditional branching policy:
- `main` contains the current released version
- `develop` collects all changes planned for inclusion into the next release

## Future Version Changes Summary
The code in this branch contains following changes:
## Changes Summary
- Separation of the UI components. This is necessary for the future implementation of the Stax device support.
- Fixes for UI according to the comments from Ledger team:
- Dashboard icon position (should be at the right)
Expand Down

0 comments on commit 157e4a3

Please sign in to comment.