Commit Graph

2 Commits

Author SHA1 Message Date
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
Trent White 04795709a3 formatting tweak, added datasource overview blurb. 2015-08-11 15:30:13 -04:00