Skip to content

Commit

Permalink
Merge branch 'master' of github.com:alexkrolick/use-conditional-effect
Browse files Browse the repository at this point in the history
  • Loading branch information
alexkrolick committed Jun 7, 2019
2 parents c029d21 + 85ff80f commit fbaa1dc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@
"maintenance"
]
},
{
"login": "kentcdodds",
"name": "Kent C. Dodds",
"avatar_url": "https://avatars0.githubusercontent.com/u/1500684?v=4",
"profile": "https://kentcdodds.com",
"contributions": [
"infra"
]
}
],
"repoType": "github",
"repoHost": "https://github.com",
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Thanks goes to these people ([emoji key][emojis]):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore -->
<table><tr><td align="center"><a href="https://alexkrolick.com"><img src="https://avatars3.githubusercontent.com/u/1571667?v=4" width="50px;" alt="Alex Krolick"/><br /><sub><b>Alex Krolick</b></sub></a><br /><a href="#maintenance-alexkrolick" title="Maintenance">🚧</a></td><td align="center"><a href="https://kentcdodds.com"><img src="https://avatars0.githubusercontent.com/u/1500684?v=4" width="50px;" alt="Kent C. Dodds"/><br /><sub><b>Kent C. Dodds</b></sub></a><br /><a href="#infra-kentcdodds" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td></tr></table>

<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors][all-contributors] specification.
Expand Down

0 comments on commit fbaa1dc

Please sign in to comment.