diff --git a/package.json b/package.json index 4b0538f4b0..bfde41100d 100644 --- a/package.json +++ b/package.json @@ -73,8 +73,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "1.2.0-rc.1", - "matrix-react-sdk": "1.2.0-rc.1", + "matrix-js-sdk": "1.2.0", + "matrix-react-sdk": "1.2.0", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "prop-types": "^15.6.2", diff --git a/yarn.lock b/yarn.lock index dc3b048418..e17c9d2950 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5742,10 +5742,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -matrix-js-sdk@1.2.0-rc.1: - version "1.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.2.0-rc.1.tgz#3bb495fc5dce9372e420455cd6378ddd85844026" - integrity sha512-2/lcL4QP077Du22G1W+k5KAgSreFxKbZW2dmtI5wr9icPACHHxxN/pEvWLiKkW7Q3+uulb05uTilM6zip9ux/g== +matrix-js-sdk@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.2.0.tgz#1e18f7bead2b31f1b6886299f3198f545eb7d19e" + integrity sha512-XqxIm30/ePPQxMpoSZ6560nVZN296E7DI4twGKspII+Pvc0u7p+UHTh3OXwTtPOj3eVo0ptKv3kn/a5SmYzXmQ== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5766,10 +5766,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.2.0-rc.1: - version "1.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.0-rc.1.tgz#839608feb5454361b8ed7652da933ef5d0cbef9a" - integrity sha512-ljO3IDwvcXsqyVH+/srCRCaMJrbLkdfRYotzw9GG7AY7SVtaNfgqP0uGeXi71Ly12Lo3Wd3elLDULUmm4q9OLQ== +matrix-react-sdk@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.0.tgz#8c8c204607763932c99851b2f24b27d3e27b66a5" + integrity sha512-FXUluS8gNUjHEeTFNOkpD5LgQTZM/UBxNPBYiqyVzEOWpJBVy49kJaVvEU/uzLCpHk3mde30PmTl9khAf2yVNQ== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5796,7 +5796,7 @@ matrix-react-sdk@1.2.0-rc.1: linkifyjs "^2.1.6" lodash "^4.13.1" lolex "2.3.2" - matrix-js-sdk "1.2.0-rc.1" + matrix-js-sdk "1.2.0" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0"