mirror of
				https://github.com/vector-im/element-web.git
				synced 2025-10-31 00:01:23 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
		
						commit
						370223eace
					
				| @ -73,7 +73,7 @@ | |||||||
|     "linkifyjs": "^2.1.6", |     "linkifyjs": "^2.1.6", | ||||||
|     "lodash": "^4.13.1", |     "lodash": "^4.13.1", | ||||||
|     "lolex": "2.3.2", |     "lolex": "2.3.2", | ||||||
|     "matrix-js-sdk": "0.10.9", |     "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop", | ||||||
|     "optimist": "^0.6.1", |     "optimist": "^0.6.1", | ||||||
|     "pako": "^1.0.5", |     "pako": "^1.0.5", | ||||||
|     "prop-types": "^15.5.8", |     "prop-types": "^15.5.8", | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user