Skip to content

Commit

Permalink
Merge pull request #88 from github/merge-master
Browse files Browse the repository at this point in the history
Merge master for v1 branch
  • Loading branch information
muan committed Dec 20, 2017
2 parents 71e3709 + 1a66f7e commit 7ed8d40
Show file tree
Hide file tree
Showing 15 changed files with 5,328 additions and 117 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: node_js
node_js: 6.9.1 # latest LTS
node_js:
- "node"
cache:
directories:
- node_modules/phantomjs-prebuilt
- "node_modules"
20 changes: 0 additions & 20 deletions Makefile

This file was deleted.

8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,11 @@ Attribute | Options | Description

## Browser Support

![Chrome](https://raw.github.com/alrra/browser-logos/master/chrome/chrome_48x48.png) | ![Firefox](https://raw.github.com/alrra/browser-logos/master/firefox/firefox_48x48.png) | ![IE](https://raw.github.com/alrra/browser-logos/master/internet-explorer/internet-explorer_48x48.png) | ![Opera](https://raw.github.com/alrra/browser-logos/master/opera/opera_48x48.png) | ![Safari](https://raw.github.com/alrra/browser-logos/master/safari/safari_48x48.png)
--- | --- | --- | --- | --- |
Latest ✔ | Latest ✔ | 9+ ✔ | Latest ✔ | 6.1+ ✔ |
- Chrome
- Firefox
- Safari 6.1+
- Internet Explorer 9+
- Microsoft Edge

## See Also

Expand Down
Loading

0 comments on commit 7ed8d40

Please sign in to comment.