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

Merging into master to change base branch #2820

Merged
merged 2,004 commits into from
Oct 21, 2019
Merged

Merging into master to change base branch #2820

merged 2,004 commits into from
Oct 21, 2019

Conversation

blurpesec
Copy link
Collaborator

@blurpesec blurpesec commented Oct 21, 2019

Description

We're migrating our default base branch to be master instead of develop.

The production codebase (currently hosted at https://mycrypto.com) will be using the legacy branch as it's base branch for the time being. The gau codebase (currently hosted at https://beta.mycrypto.com) will be using the master branch as it's base.

vilsbole and others added 30 commits September 18, 2019 17:09
…issues

Added support for storing multiple EthersJS singletons
…sset-mapping

Fixed a few issues with new test assets
…d-validation-functions

Unit tests for send form validation functions
Emmanuel Vilsbol and others added 24 commits October 16, 2019 19:48
…ssets

Update rate polling worker on asset updates
…nd-assets

Fixed back button in Send Assets panel
…tnets

Fixed missing gas text when sending testnet assets
…accounts

Added route redirection for pages with required accounts
Strip Redux/Shepherd out of HD wallet types in Add Account
…egacy-code

Removed a bunch of shepherd legacy code
@mycrypto-bot
Copy link
Collaborator

Staging build: MyCryptoBuilds

Copy link
Contributor

@vilsbole vilsbole left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@vilsbole vilsbole merged commit baf8638 into master Oct 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.