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

2021-09-28 15:45:09 +01:00
parent 6d0af83df4 ca3b8e596a
commit 207a1143fc
29 changed files with 397 additions and 185 deletions
@@ -1955,6 +1955,8 @@
    "Edit": "Edit",
    "Reply": "Reply",
    "Thread": "Thread",
+    "Collapse quotes │ ⇧+click": "Collapse quotes │ ⇧+click",
+    "Expand quotes │ ⇧+click": "Expand quotes │ ⇧+click",
    "Message Actions": "Message Actions",
    "Download %(text)s": "Download %(text)s",
    "Error decrypting attachment": "Error decrypting attachment",