_grafana.scss
1.89 KB
-
Merge branch 'master' of github.com:grafana/grafana · 145c14ed
Conflicts: public/sass/.sass-lint.yml tasks/options/sasslint.js
Torkel Ödegaard committed
Conflicts: public/sass/.sass-lint.yml tasks/options/sasslint.js