Flip back to develop

pull/11658/head
J. Ryan Stinnett 3 years ago
parent eb42793ad5
commit dd9eda8f97
  1. 4
      package.json
  2. 24
      yarn.lock

@ -71,8 +71,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "2.4.6",
"matrix-react-sdk": "1.7.5",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"postcss-easings": "^2.0.0",

@ -1652,11 +1652,6 @@ bluebird-lst@^1.0.9:
dependencies:
bluebird "^3.5.5"
bluebird@3.5.5:
version "3.5.5"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
bluebird@^3.3.0, bluebird@^3.5.0, bluebird@^3.5.5:
version "3.7.2"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@ -6037,13 +6032,12 @@ 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@github:matrix-org/matrix-js-sdk#develop":
version "2.4.5"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/772d66838942473acc7abe63374eb4397d6c2c93"
matrix-js-sdk@2.4.6, "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "2.4.6"
uid "01f0dd4498fb689cb66091aff7aa0ae49f9b8ebf"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/01f0dd4498fb689cb66091aff7aa0ae49f9b8ebf"
dependencies:
another-json "^0.2.0"
babel-runtime "^6.26.0"
bluebird "3.5.5"
browser-request "^0.3.3"
bs58 "^4.0.1"
content-type "^1.0.2"
@ -6061,8 +6055,8 @@ matrix-mock-request@^1.2.3:
expect "^1.20.2"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "1.7.4"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/cb28e2062b87055deb29d49784fed2891e867ef1"
version "1.7.5"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/cb50f5ff5fee33749ad2e5d556232818e3dcf2e0"
dependencies:
babel-plugin-syntax-dynamic-import "^6.18.0"
babel-runtime "^6.26.0"
@ -6116,6 +6110,7 @@ matrix-mock-request@^1.2.3:
text-encoding-utf-8 "^1.0.1"
url "^0.11.0"
velocity-animate "^1.5.2"
what-input "^5.2.6"
whatwg-fetch "^1.1.1"
zxcvbn "^4.4.2"
@ -9636,6 +9631,11 @@ websocket-extensions@>=0.1.1:
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
what-input@^5.2.6:
version "5.2.6"
resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.6.tgz#ac6f003bf8d3592a0031dea7a03565469b00020b"
integrity sha512-a0BcI5YR7xp87vSzGcbN0IszJKpUQuTmrZaTSQBl7TLDIdKj6rDhluQ7b/7lYGG81gWDvkySsEvwv4BW5an9kg==
whatwg-fetch@>=0.10.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"

Loading…
Cancel
Save