Skip to content

Commit

Permalink
Merge pull request #31 from fga-eps-mds/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
nukdown committed Nov 28, 2018
2 parents a6c9155 + fbb9890 commit 685ef5c
Show file tree
Hide file tree
Showing 14 changed files with 1,242 additions and 131 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ deploy:
skip_cleanup: true
api_key:
secure: ${HEROKU_KEY}
app: gbi-frontend-staging
app: gbi-frontend2-staging
on:
repo: fga-eps-mds/2018.2-GamesBI-FrontEnd
branch: develop
- provider: heroku
skip_cleanup: true
api_key:
secure: ${HEROKU_KEY}
app: gbi-frontend-production
app: gbi-frontend2-production
on:
repo: fga-eps-mds/2018.2-GamesBI-FrontEnd
branch: master
Loading

0 comments on commit 685ef5c

Please sign in to comment.