Merge branch 'release-2.0.0'

grafana · Jul 12, 2015 · dda5021 · dda5021
2 parents c4d2eb5 + d20bd8e
commit dda5021
Show file tree

Hide file tree

Showing 7 changed files with 439 additions and 310 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,8 @@
 .idea/
 
 *.bat
+
+# Grafana linter config
+.jshintrc
+.jscs.json
+.jsfmtrc