Skip to content

Commit

Permalink
Merge branch 'master' into react-modal-2.4.1-14.0.0-app--react
Browse files Browse the repository at this point in the history
  • Loading branch information
Hypnosphi authored Oct 6, 2017
2 parents 5ba492a + cd16f7b commit 577b7d9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 16 deletions.
2 changes: 1 addition & 1 deletion lib/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"podda": "^1.2.2",
"prop-types": "^15.6.0",
"qs": "^6.5.1",
"react-icons": "^2.2.5",
"react-icons": "^2.2.7",
"react-inspector": "^2.2.0",
"react-komposer": "^2.0.0",
"react-modal": "^2.3.3",
Expand Down
22 changes: 7 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9059,12 +9059,6 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"

prop-types@15.5.8:
version "15.5.8"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"
dependencies:
fbjs "^0.8.9"

prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0:
version "15.6.0"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
Expand Down Expand Up @@ -9359,17 +9353,15 @@ react-html-attributes@^1.3.0:
dependencies:
html-element-attributes "^1.0.0"

react-icon-base@2.0.7:
version "2.0.7"
resolved "https://registry.yarnpkg.com/react-icon-base/-/react-icon-base-2.0.7.tgz#0bd18736bd6ce79ca6d69ce8387a07fb8d4ceffe"
dependencies:
prop-types "15.5.8"
react-icon-base@2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/react-icon-base/-/react-icon-base-2.1.0.tgz#a196e33fdf1e7aaa1fda3aefbb68bdad9e82a79d"

react-icons@^2.2.5:
version "2.2.5"
resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-2.2.5.tgz#f942501c21a4cc0456ce2bbee5032c93f6051dcf"
react-icons@^2.2.7:
version "2.2.7"
resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-2.2.7.tgz#d7860826b258557510dac10680abea5ca23cf650"
dependencies:
react-icon-base "2.0.7"
react-icon-base "2.1.0"

react-inspector@^2.2.0:
version "2.2.0"
Expand Down

0 comments on commit 577b7d9

Please sign in to comment.