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

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