summaryrefslogtreecommitdiffstats
path: root/web/react/.eslintrc
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-14 16:59:24 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-14 16:59:24 -0700
commit3bd350dcaf65a89040f7ea395a19b620819ba03e (patch)
tree72b49e6fadfc1d513489b8938d5f73620ff2a6d8 /web/react/.eslintrc
parente06e292be71ca699d90bafbd635118aa47c2d7a5 (diff)
parentbfebb41bc0c0a1c5f481617f912bdf6dd483c341 (diff)
downloadchat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.gz
chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.bz2
chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.zip
Merge branch 'master' into PLT-12-log
Diffstat (limited to 'web/react/.eslintrc')
-rw-r--r--web/react/.eslintrc3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/.eslintrc b/web/react/.eslintrc
index 53cc75913..c0d0bb200 100644
--- a/web/react/.eslintrc
+++ b/web/react/.eslintrc
@@ -18,7 +18,8 @@
"es6": true
},
"globals": {
- "React": false
+ "React": false,
+ "ReactBootstrap": false
},
"rules": {
"comma-dangle": [2, "never"],