Merge branch 'master' of github.com:grafana/grafana

0011beb6 · Torkel Ödegaard · 419251ed · bd850d81 · 0011beb6
Commit 0011beb6 authored Dec 03, 2015 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 0 deletions

.gitignore
+1 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
 node_modules
+npm-debug.log
 coverage/
 .aws-config.json
 awsconfig