Skip to content

Commit

Permalink
Merge branch 'release/1.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
maoberlehner committed May 23, 2018
2 parents 8ba4123 + 513e935 commit b6272a4
Show file tree
Hide file tree
Showing 6 changed files with 4,537 additions and 8,047 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ language: node_js
node_js:
- "node"
script:
- npm run lint
- npm test -- --maxWorkers=4
- npm run coveralls
- yarn run lint
- yarn test -- --maxWorkers=4
- yarn run coveralls
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Pull requests are the greatest contributions, so be sure they are focused in sco
# Assign the original repo to a remote called "upstream"
git remote add upstream https://github.com/maoberlehner/vuex-map-fields
# Install the tools necessary for development
npm install
yarn install
```
2. Create a branch for your feature or hotfix:
```bash
Expand Down
Loading

0 comments on commit b6272a4

Please sign in to comment.