Devop/merge longest branches #53
Merged
Conversation
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
…-web3-methods # Conflicts: # package-lock.json # src/App.vue
… feature/additional-hw-wallets # Conflicts: # package-lock.json # src/App.vue # src/components/Blockie/Blockie.vue # src/layouts/InterfaceLayout/InterfaceLayout.vue # src/layouts/InterfaceLayout/components/GenerateTx/GenerateTx.vue # src/layouts/InterfaceLayout/containers/SendCurrencyContainer/SendCurrencyContainer.vue # src/main.js
Refactor/vue cli
… feature/additional-hw-wallets
kvhnuke
approved these changes
Aug 30, 2018
gamalielhere
added
Ready
SteveMieskoski
approved these changes
Aug 30, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Devop
Includes the following PRs:
#70 devop/setup-stale
#54 devop/code-qc
#51 feature/harware wallet integration
#49 devop/network logo
#48 feature/ledger integration
#47 override web3 methods
#45 feature/contracts
#41 devop/get-tokens