Skip to content

Commit

Permalink
Merge branch 'develop' into fabo/2193-hide-import
Browse files Browse the repository at this point in the history
  • Loading branch information
fedekunze authored Mar 6, 2019
2 parents fcefc26 + 6069bbe commit 6bfb04c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ commands:
cd && touch $BASH_ENV
if [ "${CIRCLE_BRANCH}" == "master" ]; then
echo 'export INFRA_PATH=iac/conf/websites/prod/${CIRCLE_PROJECT_REPONAME}' >> $BASH_ENV
echo 'export DEPLOYMENT_ENV=${CIRCLE_PROJECT_REPONAME}' >> $BASH_ENV
echo 'export INFRA_PATH=iac/conf/websites/prod/beta.cosmoswallet.io' >> $BASH_ENV
echo 'export DEPLOYMENT_ENV=beta.cosmoswallet.io' >> $BASH_ENV
echo 'export GIT_BRANCH=${CIRCLE_BRANCH}' >> $BASH_ENV
else
echo 'export INFRA_PATH=iac/conf/websites/dev/${CIRCLE_PROJECT_REPONAME}-staging.interblock.io' >> $BASH_ENV
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- [\#2043](https://github.com/cosmos/voyager/issues/2043) removed no-balance modals on staking page @fedekunze
- [\#2161](https://github.com/cosmos/voyager/pull/2161) fixed status dot position @jbibla
- [\#2193](https://github.com/cosmos/voyager/issues/2193) hide seed import @faboweb
- [\#195](https://github.com/tendermint/devops/issues/195) updated Circle config with new wallet domain name

## [1.0.0-beta.14] - 2019-03-06

Expand Down

0 comments on commit 6bfb04c

Please sign in to comment.