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

This commit is contained in:
Travis Ralston 2020-07-10 21:34:42 -06:00
commit e6706b0e7b
4 changed files with 20 additions and 19 deletions

View file

@ -24,8 +24,7 @@
"feature_dm_verification": "labs",
"feature_bridge_state": "labs",
"feature_presence_in_room_list": "labs",
"feature_custom_themes": "labs",
"feature_irc_ui": "labs"
"feature_custom_themes": "labs"
},
"piwik": {
"url": "https://piwik.riot.im/",