Michael Telatynski 667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 ...

 Conflicts:

	src/components/structures/ScrollPanel.js

	src/components/views/rooms/AppsDrawer.js

2020-09-07 14:33:57 +01:00

..

useAccountData.ts

Fix lint issues in new code

2020-07-20 20:43:55 +01:00

useAsyncMemo.ts

Convert hooks to Typescript

2020-08-04 22:00:05 +01:00

useDispatcher.ts

Use variable name instead of _

2020-07-20 20:55:35 +01:00

useEventEmitter.ts

Convert hooks to Typescript

2020-08-04 22:00:05 +01:00

useIsEncrypted.ts

factor out the useIsEncrypted hook

2020-09-03 15:06:41 +01:00

useLocalStorageState.ts

Update src/hooks/useLocalStorageState.ts

2020-08-27 10:56:04 +01:00

useSettings.ts

Convert feature setting usages to regular settings

2020-08-17 13:12:18 -06:00

useStateToggle.ts

Convert hooks to Typescript

2020-08-04 22:00:05 +01:00

useTimeout.ts

add timing/interval/expiry hooks

2020-06-29 11:35:14 +01:00