Merge remote-tracking branch 'origin/master' into develop

7395bbda · Torkel Ödegaard · 9fb60c2f · 814d164e · 7395bbda
Commit 7395bbda authored Aug 02, 2017 by Torkel Ödegaard
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

CHANGELOG.md
+1 -1

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@
 * **InfluxDB**: Wrong username/password parameter name when using direct access, fixes [#8789](https://github.com/grafana/grafana/issues/8789)
 * **Forms(TextArea)**: Bug fix for no scroll in text areas [#8797](https://github.com/grafana/grafana/issues/8797)
 * **Png Render API**: Bug fix for timeout url parameter. It now works as it should. Default value was also increased from 30 to 60 seconds [#8710](https://github.com/grafana/grafana/issues/8710)
-* **Search**: Fux fir not being able to close search by clicking on right side of search result container, [8848](https://github.com/grafana/grafana/issues/8848)
+* **Search**: Fix for not being able to close search by clicking on right side of search result container, [8848](https://github.com/grafana/grafana/issues/8848)
 * **Cloudwatch**: Fix for using variables in templating metrics() query, [8965](https://github.com/grafana/grafana/issues/8965)
 ## Changes