mirror of
				https://github.com/vector-im/element-web.git
				synced 2025-10-31 16:21:46 +01:00 
			
		
		
		
	Merge pull request #1766 from vector-im/rav/use_right_olm
webpack: always use the olm from vector-web
This commit is contained in:
		
						commit
						19dbd85d44
					
				| @ -43,6 +43,10 @@ module.exports = { | ||||
| 
 | ||||
|             // same goes for js-sdk
 | ||||
|             "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'), | ||||
| 
 | ||||
|             // make sure we use the version of olm from vector-web rather than
 | ||||
|             // js-sdk.
 | ||||
|             "olm": path.resolve('./node_modules/olm'), | ||||
|         }, | ||||
|     }, | ||||
|     plugins: [ | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user