Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/CityOfZion/neon-wallet into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
comountainclimber committed Apr 29, 2022
2 parents 5528cf6 + 09e0660 commit a532a35
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"jsqr": "1.1.1",
"keyvaluestorage": "^0.7.1",
"lodash-es": "4.17.21",
"moment": "2.22.2",
"moment": "2.29.2",
"nock": "9.2.3",
"node-hid": "^1.3.1",
"prop-types": "15.6.2",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10224,10 +10224,10 @@ modify-filename@^1.1.0:
resolved "https://registry.yarnpkg.com/modify-filename/-/modify-filename-1.1.0.tgz#9a2dec83806fbb2d975f22beec859ca26b393aa1"
integrity sha1-mi3sg4Bvuy2XXyK+7IWcoms5OqE=

moment@2.22.2:
version "2.22.2"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
moment@2.29.2:
version "2.29.2"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==

moo@^0.5.0:
version "0.5.1"
Expand Down

0 comments on commit a532a35

Please sign in to comment.