Merge branch 'master' into greenkeeper/@neogeek/eslint-config-standards-1.13.1

neogeek · web-flow · commit 59983225c09e · 2017-02-23T20:11:53.000-05:00
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "@neogeek/eslint-config-standards": "1.13.1",
-    "eslint": "3.15.0"
+    "eslint": "3.16.1"
   },
   "peerDependencies": {
     "doxdox": "~2.0.1"
