Michael Telatynski d8acc0612a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 ...

 Conflicts:

	src/components/views/rooms/EditMessageComposer.js

	src/components/views/rooms/SendMessageComposer.js

2021-05-24 21:57:38 +01:00

..

autocomplete.ts

Redo and fix trailing characters in user pills

2021-04-07 11:52:07 +02:00

caret.ts

Replace Riot with Element in docs and comments

2020-08-03 18:33:36 +01:00

deserialize.ts

Refactor maths config options to nested structure

2021-04-06 14:52:55 +02:00

diff.ts

Convert editor to TypeScript

2020-07-15 09:45:45 +01:00

dom.ts

Lint new new code

2020-07-20 20:48:27 +01:00

history.ts

Switch to a discriminated unions

2020-07-20 16:33:53 +01:00

model.ts

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740

2021-05-24 21:57:38 +01:00

offset.ts

Convert editor to TypeScript

2020-07-15 09:45:45 +01:00

operations.ts

Switch to a discriminated unions

2020-07-20 16:33:53 +01:00

parts.ts

Don't serialize resourceId in AtRoomPill

2021-05-01 12:27:52 +02:00

position.ts

add missing types

2020-07-20 17:10:08 +01:00

range.ts

apply to whitespace in general

2020-09-29 14:17:44 +01:00

render.ts

Fix Firefox composer regression exception

2020-07-23 09:25:01 +01:00

serialize.ts

Revert to internal option

2021-05-10 17:36:33 +01:00