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

Conflicts: src/i18n/strings/en_EN.json
2021-07-30 11:34:52 +01:00
parent a3ca2abae3 7c9df71a57
commit 9eb0986353
33 changed files with 660 additions and 357 deletions
@@ -46,6 +46,7 @@ limitations under the License.

    .mx_AccessibleButton_kind_link {
        padding: 0;
+        font-size: inherit;
    }

    .mx_SearchBox {