Merge branch 'develop' into element

This commit is contained in:
Travis Ralston 2020-07-14 15:04:48 -06:00
commit 970859629b
3 changed files with 0 additions and 7 deletions

View file

@ -27,7 +27,6 @@
"showLabsSettings": false, "showLabsSettings": false,
"features": { "features": {
"feature_new_spinner": "labs", "feature_new_spinner": "labs",
"feature_font_scaling": "labs",
"feature_pinning": "labs", "feature_pinning": "labs",
"feature_custom_status": "labs", "feature_custom_status": "labs",
"feature_custom_tags": "labs", "feature_custom_tags": "labs",

View file

@ -11,11 +11,6 @@ dropped. Ask in the room if you are unclear about any details here.**
Replaces the old spinner image with a new, svg-based one featuring a sleeker design. Replaces the old spinner image with a new, svg-based one featuring a sleeker design.
## Font scaling (`feature_font_scaling`)
Enables font scaling options for accessibility. To alter the scale check the
appearance tab in settings.
## Message pinning (`feature_pinning`) ## Message pinning (`feature_pinning`)
Allows you to pin messages in the room. To pin a message, use the 3 dots to the right of the message Allows you to pin messages in the room. To pin a message, use the 3 dots to the right of the message

View file

@ -14,7 +14,6 @@
"bug_report_endpoint_url": "https://riot.im/bugreports/submit", "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"features": { "features": {
"feature_new_spinner": "labs", "feature_new_spinner": "labs",
"feature_font_scaling": "labs",
"feature_pinning": "labs", "feature_pinning": "labs",
"feature_custom_status": "labs", "feature_custom_status": "labs",
"feature_custom_tags": "labs", "feature_custom_tags": "labs",