Merge branch 'master' into release

This commit is contained in:
Jason Poon 2018-08-08 21:53:24 -07:00 committed by GitHub
commit 1f6b68c411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

6
package-lock.json generated
View File

@ -5395,9 +5395,9 @@
"dev": true
},
"prettier": {
"version": "1.14.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.14.0.tgz",
"integrity": "sha512-KtQ2EGaUwf2EyDfp1fxyEb0PqGKakVm0WyXwDt6u+cAoxbO2Z2CwKvOe3+b4+F2IlO9lYHi1kqFuRM70ddBnow==",
"version": "1.14.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.14.2.tgz",
"integrity": "sha512-McHPg0n1pIke+A/4VcaS2en+pTNjy4xF+Uuq86u/5dyDO59/TtFZtQ708QIRkEZ3qwKz3GVkVa6mpxK/CpB8Rg==",
"dev": true
},
"pretty-hrtime": {

View File

@ -696,7 +696,7 @@
"minimist": "1.2.0",
"mocha": "5.2.0",
"plugin-error": "1.0.1",
"prettier": "1.14.0",
"prettier": "1.14.2",
"tslint": "5.11.0",
"typescript": "3.0.1",
"vscode": "1.1.18"