Merge branch 'develop' into travis/mjolnir

This commit is contained in:
Bruno Windels 2019-11-11 15:47:29 +00:00 committed by GitHub
commit 5041e6f3d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 297 additions and 49 deletions

View file

@ -13,22 +13,14 @@
"hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"features": {
"feature_rich_quoting": "labs",
"feature_pinning": "labs",
"feature_presence_management": "labs",
"feature_sticker_messages": "labs",
"feature_jitsi": "labs",
"feature_tag_panel": "enable",
"feature_keybackup": "labs",
"feature_custom_status": "labs",
"feature_custom_tags": "labs",
"feature_lazyloading": "enable",
"feature_tabbed_settings": "labs",
"feature_sas": "labs",
"feature_room_breadcrumbs": "labs",
"feature_state_counters": "labs",
"feature_many_integration_managers": "labs",
"feature_mjolnir": "labs"
"feature_user_info_panel": "labs",
"feature_dm_verification": "labs"
},
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {