Merge branch 'develop' into travis/room-list-2

This commit is contained in:
Travis Ralston 2020-05-21 13:29:20 -06:00 committed by GitHub
commit 6f7570d877
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 410 additions and 342 deletions

View file

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