Merge pull request element-hq#1678 from vector-im/rav/olmify_develop_again

dbkr · web-flow · commit 95567956116b · 2016-06-20T15:28:06.000+01:00
package.json: add olm as optionalDependency
diff --git a/package.json b/package.json
@@ -79,5 +79,8 @@
     "rimraf": "^2.4.3",
     "source-map-loader": "^0.1.5",
     "webpack": "^1.12.14"
+  },
+  "optionalDependencies": {
+    "olm": "https://matrix.org/packages/npm/olm/olm-0.1.0.tgz"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -79,5 +79,8 @@`
`79`	`79`	`"rimraf": "^2.4.3",`
`80`	`80`	`"source-map-loader": "^0.1.5",`
`81`	`81`	`"webpack": "^1.12.14"`
	`82`	`+ },`
	`83`	`+ "optionalDependencies": {`
	`84`	`+ "olm": "https://matrix.org/packages/npm/olm/olm-0.1.0.tgz"`
`82`	`85`	`}`
`83`	`86`	`}`