Merge branch 'master' into next

This commit is contained in:
Kim Gardner
2018-01-04 17:28:13 -05:00
committed by GitHub
33 changed files with 1121 additions and 25 deletions
+1
View File
@@ -199,6 +199,7 @@
"eslint": "^4.5.0",
"eslint-plugin-mocha": "^4.11.0",
"identity-obj-proxy": "^3.0.0",
"ip": "^1.1.5",
"jest": "^21.2.1",
"mocha": "^3.1.2",
"mocha-junit-reporter": "^1.12.1",