Merge branch 'main' of github.com:pyroscope-io/grafana-panel-plugin into main

Loggy · Loggy · commit a02a30d13b2d · 2021-06-02T21:17:23.000+03:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,10 +3,10 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pyroscope-pyroscope-grafana",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "description": "Pyroscope plugin for grafana",
   "scripts": {
     "build": "grafana-toolkit plugin:build",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pyroscope-pyroscope-grafana",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "0.0.1",`
`4`	`4`	`"description": "Pyroscope plugin for grafana",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "grafana-toolkit plugin:build",`