Skip to content

Commit

Permalink
Merge 93d3089 into 0463d39
Browse files Browse the repository at this point in the history
  • Loading branch information
evaporei committed Jul 18, 2018
2 parents 0463d39 + 93d3089 commit 70bfe38
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 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 @@ -21,6 +21,7 @@
"dependencies": {
"circular-json": "0.5.5",
"cuid": "^1.3.8",
"iron-mask": "1.0.2",
"moment-timezone": "^0.5.13",
"pokeprop": "^1.0.0",
"ramda": "^0.23.0"
Expand All @@ -35,7 +36,6 @@
"eslint-plugin-node": "^4.2.2",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-standard": "^3.0.1",
"iron-mask": "^1.0.2",
"log4js": "^3.0.0",
"mask-json": "^1.0.2",
"nyc": "^13.0.0",
Expand Down

0 comments on commit 70bfe38

Please sign in to comment.