3 Commits

Author	SHA1	Message	Date
bergquist	2fdb47ae97	docs(prometheus): rewrote and shorten the note about templates	2017-01-16 11:50:12 +01:00
bergquist	2696d6cd3f	Merge branch 'master' of https://github.com/andrewhowdencom/grafana into andrewhowdencom-master	2017-01-16 11:47:13 +01:00
bergquist	92f0a22fd7	docs: moves datsources pages to feature folder	2017-01-16 11:13:27 +01:00