Skip to content

Commit

Permalink
Merge branch 'develop' into readme
Browse files Browse the repository at this point in the history
  • Loading branch information
srod authored Apr 3, 2018
2 parents a70a8e9 + 1c94d6a commit 1c87ae0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"ora": "1.1.0",
"sqwish": "0.2.2",
"text-table": "0.2.0",
"uglify-js": "3.3.17",
"uglify-js": "3.3.18",
"update-notifier": "2.4.0",
"xtend": "4.0.1"
},
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4454,9 +4454,9 @@ typedarray@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"

uglify-js@3.3.17:
version "3.3.17"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.17.tgz#f32a66b191fe18a5b6b4b66b75c0a195f7811f9e"
uglify-js@3.3.18:
version "3.3.18"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.18.tgz#e16df66d71638df3c9bc61cce827e46f24bdac02"
dependencies:
commander "~2.15.0"
source-map "~0.6.1"
Expand Down

0 comments on commit 1c87ae0

Please sign in to comment.