gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1766 from vector-im/rav/use_right_olm 

webpack: always use the olm from vector-web
This commit is contained in:
David Baker 2016-07-13 09:48:08 +01:00 committed by GitHub
parent 74f459f8a4 ef4b604caf
commit 19dbd85d44
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webpack.config.js
View File

@ -43,6 +43,10 @@ module.exports = {
// same goes for js-sdk // same goes for js-sdk
"matrix-js-sdk": path.resolve('./node_modules/matrix-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: [ plugins: [