Skip to content

Commit

Permalink
Merge branch 'master' into fix-changelog-237
Browse files Browse the repository at this point in the history
  • Loading branch information
jerodsanto committed Nov 2, 2018
2 parents ea8816b + 35762cf commit 9656b3a
Show file tree
Hide file tree
Showing 18 changed files with 159 additions and 113 deletions.
36 changes: 36 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1149,6 +1149,42 @@
"contributions": [
"doc"
]
},
{
"login": "samcoren",
"name": "Sam Coren",
"avatar_url": "https://avatars3.githubusercontent.com/u/6501528?v=4",
"profile": "https://github.com/samcoren",
"contributions": [
"doc"
]
},
{
"login": "michdess",
"name": "Michael",
"avatar_url": "https://avatars3.githubusercontent.com/u/22342988?v=4",
"profile": "https://github.com/michdess",
"contributions": [
"doc"
]
},
{
"login": "ggoldammer",
"name": "Gabriel Viveros-Goldammer",
"avatar_url": "https://avatars2.githubusercontent.com/u/25766469?v=4",
"profile": "https://github.com/ggoldammer",
"contributions": [
"doc"
]
},
{
"login": "knsy",
"name": "knsy",
"avatar_url": "https://avatars0.githubusercontent.com/u/11252825?v=4",
"profile": "https://github.com/knsy",
"contributions": [
"doc"
]
}
]
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
| [<img src="https://avatars0.githubusercontent.com/u/44274592?v=4" width="100px;"/><br /><sub><b>dolphinstar9</b></sub>](https://github.com/dolphinstar9)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=dolphinstar9 "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/18628614?v=4" width="100px;"/><br /><sub><b>denozk</b></sub>](https://github.com/denozk)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=denozk "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/5010310?v=4" width="100px;"/><br /><sub><b>Brandon Tiqui</b></sub>](http://www.linkedin.com/in/brandontiqui)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=brandontiqui "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/36218769?v=4" width="100px;"/><br /><sub><b>Adedire Olayinka</b></sub>](http://dryinkuzz.github.io)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=DrYinkuzz "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/44335654?v=4" width="100px;"/><br /><sub><b>Leq1</b></sub>](https://github.com/Leq1)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=Leq1 "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/16919599?v=4" width="100px;"/><br /><sub><b>Marko Leppänen</b></sub>](https://github.com/Marantle)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=Marantle "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/22063646?v=4" width="100px;"/><br /><sub><b>kiku511</b></sub>](https://github.com/kiku511)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=kiku511 "Documentation") |
| [<img src="https://avatars2.githubusercontent.com/u/19607794?v=4" width="100px;"/><br /><sub><b>srishti-learner</b></sub>](https://github.com/srishti-learner)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=srishti-learner "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/167443?v=4" width="100px;"/><br /><sub><b>Arthur Maltson</b></sub>](http://maltson.com)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=amaltson "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/19834579?v=4" width="100px;"/><br /><sub><b>Tyler</b></sub>](http://nmbrgts.github.io)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=nmbrgts "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/5184071?v=4" width="100px;"/><br /><sub><b>Jared Scott</b></sub>](https://github.com/jlax47)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=jlax47 "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/7348876?v=4" width="100px;"/><br /><sub><b>Livia Scapin</b></sub>](https://github.com/liviascapin)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=liviascapin "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/40728370?v=4" width="100px;"/><br /><sub><b>The1FINCH</b></sub>](https://github.com/The1FINCH)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=The1FINCH "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/39866235?v=4" width="100px;"/><br /><sub><b>tdearlove</b></sub>](https://github.com/tdearlove)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=tdearlove "Documentation") |
| [<img src="https://avatars2.githubusercontent.com/u/22990831?v=4" width="100px;"/><br /><sub><b>hadams17</b></sub>](https://github.com/hadams17)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=hadams17 "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/392649?v=4" width="100px;"/><br /><sub><b>Will Fife</b></sub>](https://github.com/sarlalian)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=sarlalian "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/44374164?v=4" width="100px;"/><br /><sub><b>periodic-table-4-2</b></sub>](https://github.com/periodic-table-4-2)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=periodic-table-4-2 "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/762647?v=4" width="100px;"/><br /><sub><b>Zachary Bouzan-Kaloustian</b></sub>](http://about.me/zacharybk)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=zacharybk "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/2294736?v=4" width="100px;"/><br /><sub><b>Chris Bystrek</b></sub>](https://twitter.com/cbyst)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=cByst "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/4532801?v=4" width="100px;"/><br /><sub><b>Cristina Ruth</b></sub>](https://github.com/CristinaRuth)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=CristinaRuth "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/44554900?v=4" width="100px;"/><br /><sub><b>Samantha</b></sub>](https://github.com/staube)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=staube "Documentation") |
| [<img src="https://avatars1.githubusercontent.com/u/33627455?v=4" width="100px;"/><br /><sub><b>Marcus van Egmond</b></sub>](https://github.com/mvngmnd)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=mvngmnd "Documentation") |
| [<img src="https://avatars1.githubusercontent.com/u/33627455?v=4" width="100px;"/><br /><sub><b>Marcus van Egmond</b></sub>](https://github.com/mvngmnd)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=mvngmnd "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/6501528?v=4" width="100px;"/><br /><sub><b>Sam Coren</b></sub>](https://github.com/samcoren)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=samcoren "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/22342988?v=4" width="100px;"/><br /><sub><b>Michael</b></sub>](https://github.com/michdess)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=michdess "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/25766469?v=4" width="100px;"/><br /><sub><b>Gabriel Viveros-Goldammer</b></sub>](https://github.com/ggoldammer)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=ggoldammer "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/11252825?v=4" width="100px;"/><br /><sub><b>knsy</b></sub>](https://github.com/knsy)<br />[📖](https://github.com/thechangelog/transcripts/commits?author=knsy "Documentation") |
<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
Expand Down
Loading

0 comments on commit 9656b3a

Please sign in to comment.