Michael Telatynski 9c916cc544 Merge branches 'develop' and 't3chguy/app_load4' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4 ...

 Conflicts:

	src/components/structures/MatrixChat.tsx

2020-04-30 17:41:14 +01:00

..

permalinks

…

Accessibility.js

…

AutoDiscoveryUtils.js

…

colour.js

…

createMatrixClient.js

…

DecryptFile.js

…

DirectoryUtils.js

…

DMRoomMap.js

…

EditorStateTransfer.js

…

ErrorUtils.js

…

EventUtils.js

…

FontManager.js

…

FormattingUtils.js

…

HostingLink.js

…

humanize.js

…

IdentityServerUtils.js

…

KeyVerificationStateObserver.js

…

MatrixGlob.js

…

MegolmExportEncryption.js

…

MessageDiffUtils.js

…

MultiInviter.js

…

NamingUtils.ts

…

pages.js

…

PasswordScorer.js

…

pillify.js

…

PinningUtils.js

…

promise.ts

C

2020-04-22 13:08:33 +01:00

Receipt.js

…

rem.js

lint

2020-04-27 11:51:55 +01:00

replaceableComponent.ts

…

ResizeNotifier.js

…

ShieldUtils.ts

Separate toasts for existing & new device verification

2020-04-28 18:35:16 +01:00

StorageManager.js

…

strings.ts

…

Timer.js

…

TypeUtils.js

…

UrlUtils.js

…

WidgetUtils.js

Merge pull request #4458 from matrix-org/travis/fix-sticker-picker-add

2020-04-23 08:18:12 -06:00