Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/eslint-plugin-promise-4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
feross committed Aug 28, 2018
2 parents 82780e5 + df1b7c4 commit ff070b8
Show file tree
Hide file tree
Showing 3 changed files with 741 additions and 3 deletions.
3 changes: 2 additions & 1 deletion README.md
Expand Up @@ -20,7 +20,8 @@
<a href="/docs/README-kokr.md">한국어 (Korean)</a> •
<a href="/docs/README-ptbr.md">Português (Brasil)</a> •
<a href="/docs/README-zhcn.md">简体中文 (Simplified Chinese)</a> •
<a href="/docs/README-zhtw.md">繁體中文 (Taiwanese Mandarin)</a>
<a href="/docs/README-zhtw.md">繁體中文 (Taiwanese Mandarin)</a> •
<a href="/docs/README-fr.md">Français</a> •
</p>

<p align="center">
Expand Down

0 comments on commit ff070b8

Please sign in to comment.