Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Devop/merge longest branches #53

Merged
merged 271 commits into from
Aug 30, 2018
Merged

Conversation

gamalielhere
Copy link
Contributor

@gamalielhere gamalielhere commented Aug 17, 2018

Devop

  • Add PR label

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

SteveMieskoski and others added 30 commits August 8, 2018 23:22
…-web3-methods

# Conflicts:
#	package-lock.json
#	src/App.vue
kvhnuke and others added 15 commits August 29, 2018 14:56
… 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
@gamalielhere gamalielhere added Ready Tag for when a PR is ready to merge and removed WIP work in proress labels Aug 30, 2018
@SteveMieskoski SteveMieskoski merged commit 90f503a into develop Aug 30, 2018
@gamalielhere gamalielhere deleted the devop/mergeLongestBranches branch August 30, 2018 22:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Devop Devop tasks Ready Tag for when a PR is ready to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants