Merge branch 'develop' into travis/feature/wellknown2

This commit is contained in:
Travis Ralston 2019-05-16 12:58:09 -06:00
commit 1ac5df3cd0
9 changed files with 32 additions and 12 deletions

View file

@ -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",