Skip to content

Commit d182646

Browse files
authored
Merge branch 'master' into an/feat/prefer-in-document
2 parents 3d2333e + aeb80dc commit d182646

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

.all-contributorsrc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,17 @@
120120
"contributions": [
121121
"bug"
122122
]
123+
},
124+
{
125+
"login": "AntonNiklasson",
126+
"name": "Anton Niklasson",
127+
"avatar_url": "https://avatars0.githubusercontent.com/u/785676?v=4",
128+
"profile": "http://www.antn.se",
129+
"contributions": [
130+
"code",
131+
"test",
132+
"doc"
133+
]
123134
}
124135
]
125136
}

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[![MIT License][license-badge]][license]
1515

1616
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
17-
[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-)
17+
[![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](#contributors-)
1818
<!-- ALL-CONTRIBUTORS-BADGE:END -->
1919
[![PRs Welcome][prs-badge]][prs]
2020
[![Code of Conduct][coc-badge]][coc]
@@ -153,6 +153,7 @@ Thanks goes to these people ([emoji key][emojis]):
153153
<td align="center"><a href="https://github.com/atsikov"><img src="https://avatars3.githubusercontent.com/u/1422928?v=4" width="100px;" alt=""/><br /><sub><b>Aleksei Tsikov</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-jest-dom/issues?q=author%3Aatsikov" title="Bug reports">🐛</a></td>
154154
<td align="center"><a href="https://mario.dev"><img src="https://avatars1.githubusercontent.com/u/2677072?v=4" width="100px;" alt=""/><br /><sub><b>Mario Beltrán Alarcón</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-jest-dom/commits?author=Belco90" title="Documentation">📖</a></td>
155155
<td align="center"><a href="https://codepen.io/ariperkkio/"><img src="https://avatars2.githubusercontent.com/u/14806298?v=4" width="100px;" alt=""/><br /><sub><b>Ari Perkkiö</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-jest-dom/issues?q=author%3AAriPerkkio" title="Bug reports">🐛</a></td>
156+
<td align="center"><a href="http://www.antn.se"><img src="https://avatars0.githubusercontent.com/u/785676?v=4" width="100px;" alt=""/><br /><sub><b>Anton Niklasson</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-jest-dom/commits?author=AntonNiklasson" title="Code">💻</a> <a href="https://github.com/testing-library/eslint-plugin-jest-dom/commits?author=AntonNiklasson" title="Tests">⚠️</a> <a href="https://github.com/testing-library/eslint-plugin-jest-dom/commits?author=AntonNiklasson" title="Documentation">📖</a></td>
156157
</tr>
157158
</table>
158159

0 commit comments

Comments
 (0)