Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
rickythefox authored Feb 12, 2019
2 parents 4da5e6d + 8916f75 commit 506022d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
20 changes: 10 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@
"@types/diff-match-patch": "1.0.32",
"@types/lodash": "4.14.120",
"@types/mocha": "5.2.5",
"@types/node": "9.6.41",
"@types/node": "9.6.42",
"@types/sinon": "7.0.5",
"gulp": "4.0.0",
"gulp-bump": "3.1.3",
Expand All @@ -722,6 +722,6 @@
"sinon": "7.2.3",
"tslint": "5.12.1",
"typescript": "3.3.3",
"vscode": "1.1.28"
"vscode": "1.1.29"
}
}

0 comments on commit 506022d

Please sign in to comment.