From 1b4f4b6b65d754d5dfa78939d4f9c544865048a9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 31 Oct 2019 13:21:15 -0600
Subject: [PATCH 1/2] Add labs documentation for Mjolnir

---
 docs/labs.md                | 6 ++++++
 riot.im/develop/config.json | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/labs.md b/docs/labs.md
index ae2c72a4..7a3600b3 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -49,3 +49,9 @@ That's it. Now should see your new counter under the header.
 ## Multiple integration managers (`feature_many_integration_managers`)
 
 Exposes a way to access all the integration managers known to Riot. This is an implementation of [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957).
+
+## New ways to ignore people (`feature_mjolnir`)
+
+When enabled, a new settings tab appears for users to be able to manage their ban lists. 
+This is a different kind of ignoring where the ignored user's messages still get rendered, 
+but are hidden by default.
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
index f028ab97..ed31d62a 100644
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -27,7 +27,8 @@
         "feature_sas": "labs",
         "feature_room_breadcrumbs": "labs",
         "feature_state_counters": "labs",
-        "feature_many_integration_managers": "labs"
+        "feature_many_integration_managers": "labs",
+        "feature_mjolnir": "labs"
     },
     "welcomeUserId": "@riot-bot:matrix.org",
     "piwik": {

From 956c199fcfa26e6122b3000548d9c0b6143c687f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 6 Nov 2019 12:25:34 -0700
Subject: [PATCH 2/2] Add some docs to describe Mjolnir and Ban Lists

---
 docs/labs.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/labs.md b/docs/labs.md
index 7a3600b3..0c1fb7d0 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -55,3 +55,7 @@ Exposes a way to access all the integration managers known to Riot. This is an i
 When enabled, a new settings tab appears for users to be able to manage their ban lists. 
 This is a different kind of ignoring where the ignored user's messages still get rendered, 
 but are hidden by default.
+
+Ban lists are rooms within Matrix, proposed as [MSC2313](https://github.com/matrix-org/matrix-doc/pull/2313).
+[Mjolnir](https://github.com/matrix-org/mjolnir) is a set of moderation tools which support
+ban lists.