Merge branch 'develop' into element

config.sample.json

@@ -31,8 +31,7 @@
         "feature_pinning": "labs",
         "feature_custom_status": "labs",
         "feature_custom_tags": "labs",
-        "feature_state_counters": "labs",
-        "feature_irc_ui": "labs"
+        "feature_state_counters": "labs"
     },
     "default_federate": true,
     "default_theme": "light",

docs/labs.md

@@ -105,8 +105,3 @@ For some sample themes, check out [aaronraimist/riot-web-themes](https://github.
 A complete rewrite of the room list is underway to increase performance, stability,
 and general usability. This is still rapidly changing, but feel free to give it a test.
 
-## IRC message layout (`feature_irc_ui`)
-
-Adds an option to change the message layout to an IRC style ` timestamp | avatar
-| name | message `
-

riot.im/develop/config.json

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