Merge pull request element-hq#2517 from vector-im/rav/upgrade_olm

richvdh · web-flow · commit 3adf5fe3fd35 · 2016-10-26T16:50:22.000+01:00
Bump to olm 2.0.0
diff --git a/package.json b/package.json
@@ -114,6 +114,6 @@
     "webpack": "^1.12.14"
   },
   "optionalDependencies": {
-    "olm": "https://matrix.org/packages/npm/olm/olm-1.3.0.tgz"
+    "olm": "https://matrix.org/packages/npm/olm/olm-2.0.0.tgz"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,6 @@`
`114`	`114`	`"webpack": "^1.12.14"`
`115`	`115`	`},`
`116`	`116`	`"optionalDependencies": {`
`117`		`- "olm": "https://matrix.org/packages/npm/olm/olm-1.3.0.tgz"`
	`117`	`+ "olm": "https://matrix.org/packages/npm/olm/olm-2.0.0.tgz"`
`118`	`118`	`}`
`119`	`119`	`}`