Skip to content

Commit

Permalink
merge next/master
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonray committed Apr 13, 2018
2 parents 673e0d9 + 8fa9e6a commit 8294171
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "statman",
"version": "1.4.2",
"version": "1.5.0",
"description": "Package to assist with collection of metrics, including stopwatch functionality",
"main": "./lib/statman.js",
"scripts": {
Expand All @@ -20,7 +20,7 @@
"lodash.isfunction": "^3.0.9",
"lodash.isnull": "^3.0.0",
"statman-gauge": "^1.0.5",
"statman-meter": "1.1.0",
"statman-meter": "1.2.1",
"statman-stopwatch": "^2.7.0"
},
"devDependencies": {
Expand Down

0 comments on commit 8294171

Please sign in to comment.