Merge branch 'externalPlugin' of https://github.com/raintank/grafana into external-plugins

2015-11-19 11:05:27 +01:00
parent 730d4857ba 437b957be1
commit b21fa2daa0
10 changed files with 213 additions and 6 deletions
@@ -187,5 +187,7 @@ func Register(r *macaron.Macaron) {
 	// rendering
 	r.Get("/render/*", reqSignedIn, RenderToPng)

+	InitExternalPluginRoutes(r)
+
 	r.NotFound(NotFoundHandler)
 }