Skip to content

Commit

Permalink
Merge branch 'master' into date-relative
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmelnikow authored Jan 4, 2019
2 parents 0e94667 + 576f30f commit 5a5c784
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 29 deletions.
62 changes: 36 additions & 26 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"@babel/core": "^7.2.2",
"@babel/plugin-proposal-class-properties": "^7.2.1",
"@babel/plugin-proposal-object-rest-spread": "^7.2.0",
"@babel/polyfill": "^7.0.0",
"@babel/polyfill": "^7.2.5",
"@babel/preset-env": "^7.2.3",
"@babel/register": "7.0.0",
"@mapbox/react-click-to-select": "^2.2.0",
Expand Down Expand Up @@ -180,8 +180,8 @@
"prettier-check": "^2.0.0",
"pretty": "^2.0.0",
"prop-types": "^15.6.0",
"react": "^16.6.3",
"react-dom": "^16.6.3",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-modal": "^3.8.1",
"react-router-dom": "^4.3.1",
"read-all-stdin-sync": "^1.0.5",
Expand Down

0 comments on commit 5a5c784

Please sign in to comment.