Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 3cde221

Browse files
committed
Upgrade to react 15.0
Needs a new react-gemini-scrollbar to match.
1 parent 336d91d commit 3cde221

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Changes in <unreleased version>
2+
===============================
3+
4+
* Upgrade to react 15.0
5+
16
Changes in [0.4.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.4.0) (2016-03-30)
27
===================================================================================================
38
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.3.1...v0.4.0)

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
"matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
3434
"optimist": "^0.6.1",
3535
"q": "^1.4.1",
36-
"react": "^0.14.2",
37-
"react-dom": "^0.14.2",
38-
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#869a86b",
36+
"react": "^15.0.1",
37+
"react-dom": "^15.0.1",
38+
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#4707b88",
3939
"sanitize-html": "^1.11.1",
4040
"velocity-animate": "^1.2.3",
4141
"velocity-ui-pack": "^1.2.2"
@@ -61,7 +61,7 @@
6161
"karma-webpack": "^1.7.0",
6262
"mocha": "^2.4.5",
6363
"phantomjs-prebuilt": "^2.1.7",
64-
"react-addons-test-utils": "^0.14.7",
64+
"react-addons-test-utils": "^15.0.1",
6565
"require-json": "0.0.1",
6666
"rimraf": "^2.4.3",
6767
"sinon": "^1.17.3",

0 commit comments

Comments
 (0)