Skip to content

Another go at enabling olm on vector.im/develop#1675

Merged
dbkr merged 2 commits intodevelopfrom
rav/olmify_develop
Jun 20, 2016
Merged

Another go at enabling olm on vector.im/develop#1675
dbkr merged 2 commits intodevelopfrom
rav/olmify_develop

Conversation

@richvdh
Copy link
Copy Markdown
Member

@richvdh richvdh commented Jun 20, 2016

No description provided.

richvdh added 2 commits June 20, 2016 14:35
Since matrix-org/matrix-js-sdk#141, the jenkins build
does pull in the olm module, but because it's using npm v2, buries it deep in
node_modules. Rather than using the `fs` module to hunt for it, just try to
`require` it in the webpack config.
Take out a few misleading things from the readme.
@richvdh richvdh force-pushed the rav/olmify_develop branch from 52cb3ea to bb820be Compare June 20, 2016 13:36
@dbkr dbkr merged commit f4a3e9a into develop Jun 20, 2016
@richvdh richvdh deleted the rav/olmify_develop branch June 20, 2016 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants