Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete

Conflicts: src/components/views/rooms/BasicMessageComposer.tsx src/editor/autocomplete.ts
2021-07-15 09:59:40 +01:00
parent 28eaac0ef8 f4788a6427
commit ebfe38dc4a
910 changed files with 29171 additions and 17758 deletions
--- a/src/KeyBindingsManager.ts
+++ b/src/KeyBindingsManager.ts
@@ -138,12 +138,12 @@ export type KeyCombo = {
    ctrlKey?: boolean;
    metaKey?: boolean;
    shiftKey?: boolean;
-}
+};

 export type KeyBinding<T extends string> = {
    action: T;
    keyCombo: KeyCombo;
-}
+};

 /**
 * Helper method to check if a KeyboardEvent matches a KeyCombo