Merge branch 'master' into graph_test_docker_adjustments

dimitrovmaksim · web-flow · commit b7bc5ebb8060 · 2022-02-01T16:17:44.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@graphprotocol/graph-cli",
   "version": "0.26.0",
+  "license": "(Apache-2.0 OR MIT)",
   "description": "CLI for building for and deploying to The Graph",
   "dependencies": {
     "assemblyscript": "0.19.10",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@graphprotocol/graph-cli",`
`3`	`3`	`"version": "0.26.0",`
	`4`	`+ "license": "(Apache-2.0 OR MIT)",`
`4`	`5`	`"description": "CLI for building for and deploying to The Graph",`
`5`	`6`	`"dependencies": {`
`6`	`7`	`"assemblyscript": "0.19.10",`