Torkel Ödegaard 5aee981590 Merge branch 'master' of https://github.com/mattttt/grafana ... Conflicts: docs/sources/installation/debian.md docs/sources/installation/ldap.md		2015-08-12 16:30:48 +02:00
..
datasources	Merge branch 'master' of https://github.com/mattttt/grafana	2015-08-12 16:30:48 +02:00
guides	add text panel page	2015-08-11 16:50:33 -04:00
installation	Merge branch 'master' of https://github.com/mattttt/grafana	2015-08-12 16:30:48 +02:00
project	Reformatted a confusing part of of the running grafana locally section	2015-08-11 15:41:12 -04:00
reference	Merge branch 'master' of https://github.com/mattttt/grafana	2015-08-12 16:30:48 +02:00
index.md	add text panel page	2015-08-11 16:50:33 -04:00
jsearch.md	Added grafana 1.x docs to main repo	2015-03-10 08:56:03 +01:00
search.md	Added grafana 1.x docs to main repo	2015-03-10 08:56:03 +01:00
test.md	Added grafana 1.x docs to main repo	2015-03-10 08:56:03 +01:00
versions.html_fragment	fix(templating): can now use template vars in collapsed row title, Fixes #2305	2015-07-08 13:44:36 +02:00