Merge branch 'multiple-triggers-ds'

grafana · Dec 3, 2017 · 53d795d · 53d795d
2 parents 7cff1d6 + 5359176
commit 53d795d
Show file tree

Hide file tree

Showing 32 changed files with 2,516 additions and 1,799 deletions.
diff --git a/dist/panel-triggers/datasource-selector.directive.js b/dist/panel-triggers/datasource-selector.directive.js
diff --git a/dist/panel-triggers/datasource-selector.directive.js.map b/dist/panel-triggers/datasource-selector.directive.js.map
diff --git a/dist/panel-triggers/editor.html b/dist/panel-triggers/editor.html