Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
e2tha-e committed Nov 3, 2019
2 parents a7bf57d + f8e6f76 commit 8c391c4
Show file tree
Hide file tree
Showing 30 changed files with 2,323 additions and 2,251 deletions.
3 changes: 1 addition & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
}],
// off
"no-duplicate-case": 0,
"no-fallthrough": 0,
"radix": 0
"no-fallthrough": 0
}
}
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ branches:
- master
- release
before_install:
- brew cask install google-chrome
- brew update-reset
- brew cask install google-chrome
after_script:
- npm run coverage
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ not directly relevant to this package.
See the [Fepper README](https://github.com/electric-eloquence/fepper#ui-customization)
for more information.

[snyk-image]: https://snyk.io//test/github/electric-eloquence/fepper-ui/master/badge.svg
[snyk-url]: https://snyk.io//test/github/electric-eloquence/fepper-ui/master
[snyk-image]: https://snyk.io//test/github/electric-eloquence/fepper-ui/release/badge.svg
[snyk-url]: https://snyk.io//test/github/electric-eloquence/fepper-ui/release

[travis-image]: https://img.shields.io/travis/electric-eloquence/fepper-npm.svg
[travis-image]: https://img.shields.io/travis/electric-eloquence/fepper-npm/release.svg
[travis-url]: https://travis-ci.org/electric-eloquence/fepper-ui

[coveralls-image]: https://img.shields.io/coveralls/electric-eloquence/fepper-ui/master.svg
[coveralls-image]: https://img.shields.io/coveralls/electric-eloquence/fepper-ui/release.svg
[coveralls-url]: https://coveralls.io/r/electric-eloquence/fepper-ui

[license-image]: https://img.shields.io/github/license/electric-eloquence/fepper-ui.svg
[license-url]: https://raw.githubusercontent.com/electric-eloquence/fepper-ui/master/LICENSE
[license-url]: https://raw.githubusercontent.com/electric-eloquence/fepper-ui/release/LICENSE
Loading

0 comments on commit 8c391c4

Please sign in to comment.