Merge pull request #9598 from jryans/primary-reactions

Add reactions feature to config sample

config.sample.json

@@ -12,7 +12,8 @@
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "features": {
         "feature_groups": "labs",
-        "feature_pinning": "labs"
+        "feature_pinning": "labs",
+        "feature_reactions": "labs"
     },
     "default_federate": true,
     "default_theme": "light",

docs/labs.md

@@ -1,4 +1,4 @@
-# riot-web Labs features
+# Labs features
 
 Some notes on the features you can enable by going to `Settings->Labs`. Not exhaustive, chat in
 [#riot-web:matrix.org] for more information.
@@ -29,4 +29,10 @@ Once enabled, send a custom state event to a room to set values:
 
 That's it. Now should see your new counter under the header.
 
-[#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org
+## Reactions
+
+`feature_reactions` allows reacting to messages with emoji and displaying
+reactions from other people. This feature is currently under active development,
+and only portions have been implemented so far.
+
+[#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org