-
Notifications
You must be signed in to change notification settings - Fork 370
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into aaronmgdr/about3
* master: (72 commits) Remove unused Reserve.burnToken function (#984) Persistent disks for transaction nodes (#1016) [Wallet] Differentiate dollars and gold transactions (#1021) [wip] LinkedList cycle fix (#941) Fix slither issues (#572) [Wallet] Disable import wallet button when the backup phrase is not valid (#1012) Fix fixed fraction division underflow (#952) [CircleCI]Run protocol coverage once a day (#1018) Expose and test validator set precompiles (#874) [celotool] Fund Faucet accounts on network init (#990) Add Nexmo as a text provider for MX and US numbers (#1002) [CircleCI]Run protocol test with and without coverage (#991) Increase memory requests for Alfajores nodes (#966) [wallet]Select blockchain url based on testnet (#936) Pilot app config and ability to not show testnet banner (#1009) Add Linux onboarding steps and a TOC to SETUP.md (#1004) Add README-dev.md (#989) [Wallet] Exchange flow formatting fixes (#961) [celotool] Cleanup genesis block generation (#988) [celotool] Some ❤️. Clean up (#948) ... # Conflicts: # packages/web/src/header/Header.3.tsx
- Loading branch information
Showing
614 changed files
with
13,408 additions
and
9,264 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.