Michael Telatynski c578026474 Merge branches 'develop' and 't3chguy/fix/13641' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/13641 ...

 Conflicts:

	src/editor/parts.ts

2020-07-24 08:18:20 +01:00

..

accessibility

…

autocomplete

Extend QueryMatcher's sorting heuristic

2020-06-17 23:41:41 -04:00

components

Fix broken test

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

editor

s/semi-colon/colon/

2020-07-24 00:04:50 +01:00

end-to-end-tests

RoomSublist2 -> RoomSublist

2020-07-17 15:46:46 -06:00

i18n

…

i18n-test

…

img

…

notifications

…

stores

…

utils

…

.eslintrc.js

…

createRoom-test.js

…

DecryptionFailureTracker-test.js

…

mock-clock.js

…

PhasedRollOut-test.js

…

ScalarAuthClient-test.js

…

setupTests.js

…

skinned-sdk.js

…

Terms-test.js

…

test-utils.js

…

UserActivity-test.js

…