Merge branch 'master' of github.com:grafana/grafana

This commit is contained in:
Torkel Ödegaard 2015-09-16 15:17:57 +02:00
commit f9cd942363

View File

@ -33,7 +33,7 @@ func newMacaron() *macaron.Macaron {
mapStatic(m, "css", "css")
mapStatic(m, "img", "img")
mapStatic(m, "fonts", "fonts")
mapStatic(m, "robots.txt", "robots.txxt")
mapStatic(m, "robots.txt", "robots.txt")
m.Use(macaron.Renderer(macaron.RenderOptions{
Directory: path.Join(setting.StaticRootPath, "views"),