Files · d0df36433d619af8788f07c11e5edeb24550c244 · Kornkitt Poolsup / nexpie-grafana-theme

Merge remote-tracking branch 'upstream/master' · d0df3643

Conflicts:
	docs/kibana/configuration/config.js.asciidoc
	src/app/components/settings.js
	src/app/panels/dashcontrol/module.html
	src/app/partials/dasheditor.html
	src/config.js

committed Dec 10, 2013

d0df3643

Name	Last commit	Last Update
sample		Loading commit data...
src		Loading commit data...
tasks		Loading commit data...
.gitignore		Loading commit data...
.jshintrc		Loading commit data...
Gruntfile.js		Loading commit data...
LICENSE.md		Loading commit data...
README.md		Loading commit data...
grafana.sublime-project		Loading commit data...
grafana.sublime-workspace		Loading commit data...
index.html		Loading commit data...
package.json		Loading commit data...

README.md