summaryrefslogtreecommitdiffstats
path: root/web/static/config/config.js
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-08-14 15:13:04 -0400
committerChristopher Speller <crspeller@gmail.com>2015-08-14 15:13:04 -0400
commit9036dd99aa8ba2d9cdd6066a833862bbd9e2653a (patch)
tree41a18a9bcbbcc7cd961cc424878ac37aade5c288 /web/static/config/config.js
parentb9aef9f2a6b90663cb7ba4ff9e42560c145b631d (diff)
parent26a8e19a357aee9e1b39623e604ce92bdfaa00df (diff)
downloadchat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.tar.gz
chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.tar.bz2
chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.zip
Merge pull request #382 from mattermost/revert-360-mm-375d
Revert "MM-375 Adds text formatting features using a modified version…
Diffstat (limited to 'web/static/config/config.js')
-rw-r--r--web/static/config/config.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/web/static/config/config.js b/web/static/config/config.js
index ca4649299..00cae7ab2 100644
--- a/web/static/config/config.js
+++ b/web/static/config/config.js
@@ -15,7 +15,6 @@ var config = {
AllowInviteNames: true,
RequireInviteNames: false,
AllowSignupDomainsWizard: false,
- AllowTextFormatting: true,
// Google Developer Key (for Youtube API links)
// Leave blank to disable