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

2021-07-28 19:24:26 +01:00
parent 67ef263940 b8781b7552
commit ac800ad94d
87 changed files with 2361 additions and 644 deletions
@@ -36,7 +36,6 @@ limitations under the License.
 .mx_SettingsTab_subheading {
    font-size: $font-16px;
    display: block;
-    font-family: $font-family;
    font-weight: 600;
    color: $primary-fg-color;
    margin-bottom: 10px;