Merge branch 'develop' into travis/feature/wellknown2

2019-05-16 12:58:09 -06:00
parent 39d1293350 6f8c6bf13e
commit 1ac5df3cd0
9 changed files with 32 additions and 12 deletions
--- a/config.sample.json
+++ b/config.sample.json
@@ -21,7 +21,8 @@
    "features": {
        "feature_groups": "labs",
        "feature_pinning": "labs",
-        "feature_reactions": "labs"
+        "feature_reactions": "labs",
+        "feature_message_editing": "labs"
    },
    "default_federate": true,
    "default_theme": "light",