Merge branch 'master' into feature/jest

* master: fix for deprecated eslint rule (#165) # Conflicts: # .eslintrc
nytimes · Sep 15, 2016 · f5079bc · f5079bc
2 parents 4b5d3f5 + 2d72505
commit f5079bc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.eslintrc b/.eslintrc
@@ -21,7 +21,8 @@
       "prefer-reflect": 2,
       "no-warning-comments": [1, { "terms": ["todo", "fixme"], "location": "start" }],
       "react/sort-comp": 0,
-      "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
+      "react/require-extension": "off",
+      "import/extensions": [1, { "js": "never" }],
       "import/no-extraneous-dependencies": [0],
       "no-param-reassign": 0
     }