summaryrefslogtreecommitdiffstats
path: root/web/react/.eslintrc
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-10-28 18:04:27 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-10-28 18:04:27 +0500
commite104829dcd7ae8ea0d6ab87f341cf5c5f1b30a41 (patch)
tree769e7de1f1c12cc4d58d934709032bc1bcbdedc9 /web/react/.eslintrc
parent179c4ea684af8d2a021cc6f0042bc4408f39b0bb (diff)
parentc6f3361d3caf671ca64b798d5ac9eca97c387f9e (diff)
downloadchat-e104829dcd7ae8ea0d6ab87f341cf5c5f1b30a41.tar.gz
chat-e104829dcd7ae8ea0d6ab87f341cf5c5f1b30a41.tar.bz2
chat-e104829dcd7ae8ea0d6ab87f341cf5c5f1b30a41.zip
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
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 6a35d3123..d78068882 100644
--- a/web/react/.eslintrc
+++ b/web/react/.eslintrc
@@ -20,7 +20,8 @@
"globals": {
"React": false,
"ReactDOM": false,
- "ReactBootstrap": false
+ "ReactBootstrap": false,
+ "Chart": false
},
"rules": {
"comma-dangle": [2, "never"],