mirror of https://github.com/vector-im/riot-web
				
				
				
			js-sdk & react-sdk develop
							parent
							
								
									685d913171
								
							
						
					
					
						commit
						af57c9e321
					
				|  | @ -74,8 +74,8 @@ | |||
|     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", | ||||
|     "gfm.css": "^1.1.2", | ||||
|     "highlight.js": "^9.13.1", | ||||
|     "matrix-js-sdk": "2.4.1", | ||||
|     "matrix-react-sdk": "1.6.2", | ||||
|     "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.0.tgz", | ||||
|     "prop-types": "^15.7.2", | ||||
|  |  | |||
							
								
								
									
										12
									
								
								yarn.lock
								
								
								
								
							
							
						
						
									
										12
									
								
								yarn.lock
								
								
								
								
							|  | @ -5947,10 +5947,9 @@ 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@2.4.1: | ||||
| "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": | ||||
|   version "2.4.1" | ||||
|   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.1.tgz#f32f8ebb1f01fa26711a4cf6b78eae125156f455" | ||||
|   integrity sha512-5mOp396eOtvaMiuUD85TWvuxSP532PuvtH/QLugBGenI15FGwtnC40cTnVYviYWGBi340FPrOKWulc5ILRX6qQ== | ||||
|   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e024d047e358cf26caa47542c8f6d9a469a11cb2" | ||||
|   dependencies: | ||||
|     another-json "^0.2.0" | ||||
|     babel-runtime "^6.26.0" | ||||
|  | @ -5971,10 +5970,9 @@ matrix-mock-request@^1.2.3: | |||
|     bluebird "^3.5.0" | ||||
|     expect "^1.20.2" | ||||
| 
 | ||||
| matrix-react-sdk@1.6.2: | ||||
| "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": | ||||
|   version "1.6.2" | ||||
|   resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.6.2.tgz#c2659a2479e85b8a3e4ebbb436b1daafcb76fef5" | ||||
|   integrity sha512-+SmsM94Bolbwj+4I5bGF00zUAmlsZ4D4r7s1An/6SHMFL2+ly8QG4wDt1Q2KZ2vrcT3tnLqsp2zRsmKpCTD7ZA== | ||||
|   resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/dc9018dc116299c2a8ae177b7fe6910458f14078" | ||||
|   dependencies: | ||||
|     babel-plugin-syntax-dynamic-import "^6.18.0" | ||||
|     babel-runtime "^6.26.0" | ||||
|  | @ -6005,7 +6003,7 @@ matrix-react-sdk@1.6.2: | |||
|     linkifyjs "^2.1.6" | ||||
|     lodash "^4.17.14" | ||||
|     lolex "4.2" | ||||
|     matrix-js-sdk "2.4.1" | ||||
|     matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" | ||||
|     optimist "^0.6.1" | ||||
|     pako "^1.0.5" | ||||
|     png-chunks-extract "^1.0.0" | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 David Baker
						David Baker