Commit ca61aaf

authored

Merge branch 'main' into feat/drop-node-10

2 parents ea8a1c4 + 09a96d1 commit ca61aafCopy full SHA for ca61aaf

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -547,6 +547,15 @@`
`547`	`547`	`"contributions": [`
`548`	`548`	`"maintenance"`
`549`	`549`	`]`
	`550`	`+ },`
	`551`	`+ {`
	`552`	`+ "login": "andyrooger",`
	`553`	`+ "name": "andyrooger",`
	`554`	`+ "avatar_url": "https://avatars.githubusercontent.com/u/420834?v=4",`
	`555`	`+ "profile": "https://github.com/andyrooger",`
	`556`	`+ "contributions": [`
	`557`	`+ "code"`
	`558`	`+ ]`
`550`	`559`	`}`
`551`	`560`	`],`
`552`	`561`	`"skipCi": true,`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d`
`244`	`244`	`</tr>`
`245`	`245`	`<tr>`
`246`	`246`	`<td align="center"><a href="https://matan.io"><img src="https://avatars.githubusercontent.com/u/12711091?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matan Borenkraout</b></sub></a><br /><a href="#maintenance-MatanBobi" title="Maintenance">🚧</a></td>`
	`247`	`+ <td align="center"><a href="https://github.com/andyrooger"><img src="https://avatars.githubusercontent.com/u/420834?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andyrooger</b></sub></a><br /><a href="https://github.com/testing-library/react-hooks-testing-library/commits?author=andyrooger" title="Code">💻</a></td>`
`247`	`248`	`</tr>`
`248`	`249`	`</table>`
`249`	`250`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ export type RenderHookOptions<TProps> = {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`export type Act = {`
`67`		`- (callback: () => void \| undefined): void`
`68`	`67`	`(callback: () => Promise<void \| undefined>): Promise<undefined>`
	`68`	`+ (callback: () => void \| undefined): void`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`export type CleanupCallback = () => Promise<void> \| void`

Comments

(0)