Michael Telatynski bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets ...

 Conflicts:

	src/components/views/elements/AppTile.js

	src/utils/WidgetUtils.ts

2020-10-19 20:50:16 +01:00

..

useAccountData.ts

Fix lint issues in new code

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

useAsyncMemo.ts

Convert UserInfo to Typescript

2020-09-29 10:10:32 +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

Fix TS definitions

2020-09-23 11:00:53 +01:00

useSettings.ts

Convert feature setting usages to regular settings

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

useStateToggle.ts

convert MemberEventListSummary and ELS to Typescript

2020-09-29 10:51:48 +01:00

useTimeout.ts

…