Skip to content

Commit

Permalink
Merge pull request #122 from gorilla-devs/develop
Browse files Browse the repository at this point in the history
v0.9.2 - RAM manager and linux bugfixes
  • Loading branch information
blarfoon authored Jan 5, 2019
2 parents 38a90da + 5603121 commit 2b04a1c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,11 @@
"lodash": "^4.17.11",
"make-dir": "^1.3.0",
"ps-tree": "^1.2.0",
"react": "^16.7.0-alpha.2",
"react": "next",
"react-color": "^2.17.0",
"react-content-loader": "^3.4.1",
"react-contextmenu": "^2.10.0",
"react-dom": "^16.7.0-alpha.2",
"react-dom": "next",
"react-hot-loader": "^4.3.12",
"react-infinite-scroller": "^1.2.4",
"react-loadable": "^5.5.0",
Expand Down
22 changes: 11 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11081,15 +11081,15 @@ react-contextmenu@^2.10.0:
classnames "^2.2.5"
object-assign "^4.1.0"

react-dom@^16.7.0-alpha.2:
version "16.7.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.7.0.tgz#a17b2a7ca89ee7390bc1ed5eb81783c7461748b8"
integrity sha512-D0Ufv1ExCAmF38P2Uh1lwpminZFRXEINJe53zRAbm4KPwSyd6DY/uDoS0Blj9jvPpn1+wivKpZYc8aAAN/nAkg==
react-dom@next:
version "16.7.0-alpha.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.7.0-alpha.2.tgz#16632880ed43676315991d8b412cce6975a30282"
integrity sha512-o0mMw8jBlwHjGZEy/vvKd/6giAX0+skREMOTs3/QHmgi+yAhUClp4My4Z9lsKy3SXV+03uPdm1l/QM7NTcGuMw==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.12.0"
scheduler "^0.12.0-alpha.2"

react-hot-loader@^4.3.12:
version "4.6.3"
Expand Down Expand Up @@ -11234,15 +11234,15 @@ react-transition-group@^2.5.2:
prop-types "^15.6.2"
react-lifecycles-compat "^3.0.4"

react@^16.7.0-alpha.2:
version "16.7.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.7.0.tgz#b674ec396b0a5715873b350446f7ea0802ab6381"
integrity sha512-StCz3QY8lxTb5cl2HJxjwLFOXPIFQp+p+hxQfc8WE0QiLfCtIlKj8/+5tjjKm8uSTlAW+fCPaavGFS06V9Ar3A==
react@next:
version "16.7.0-alpha.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.7.0-alpha.2.tgz#924f2ae843a46ea82d104a8def7a599fbf2c78ce"
integrity sha512-Xh1CC8KkqIojhC+LFXd21jxlVtzoVYdGnQAi/I2+dxbmos9ghbx5TQf9/nDxc4WxaFfUQJkya0w1k6rMeyIaxQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.12.0"
scheduler "^0.12.0-alpha.2"

reactcss@^1.2.0:
version "1.2.3"
Expand Down Expand Up @@ -11956,7 +11956,7 @@ scheduler@^0.11.2:
loose-envify "^1.1.0"
object-assign "^4.1.1"

scheduler@^0.12.0:
scheduler@^0.12.0, scheduler@^0.12.0-alpha.2:
version "0.12.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.12.0.tgz#8ab17699939c0aedc5a196a657743c496538647b"
integrity sha512-t7MBR28Akcp4Jm+QoR63XgAi9YgCUmgvDHqf5otgAj4QvdoBE4ImCX0ffehefePPG+aitiYHp0g/mW6s4Tp+dw==
Expand Down

0 comments on commit 2b04a1c

Please sign in to comment.