Merge remote-tracking branch 'origin/develop' into element-develop

This commit is contained in:
J. Ryan Stinnett
2020-07-15 10:44:25 +01:00
5 changed files with 174 additions and 38 deletions

View File

@@ -14,6 +14,7 @@
"hosting_signup_link": "https://modular.im/services/matrix-hosting-riot?utm_source=riot-web&utm_medium=web",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"features": {
"feature_new_spinner": "labs",
"feature_pinning": "labs",
"feature_custom_status": "labs",
"feature_custom_tags": "labs",
@@ -23,10 +24,7 @@
"feature_dm_verification": "labs",
"feature_bridge_state": "labs",
"feature_presence_in_room_list": "labs",
"feature_custom_themes": "labs",
"feature_new_room_list": "labs",
"feature_irc_ui": "labs",
"feature_font_scaling": "labs"
"feature_custom_themes": "labs"
},
"piwik": {
"url": "https://piwik.riot.im/",