src/app/panels/histogram · 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
..
editor.html		Loading commit data...
interval.js		Loading commit data...
module.html		Loading commit data...
module.js		Loading commit data...
queriesEditor.html		Loading commit data...
styleEditor.html		Loading commit data...
timeSeries.js		Loading commit data...