docs(changelog): add note about merging #4718

30f36fe2 · bergquist · f56d45ac · 30f36fe2
Commit 30f36fe2 authored Sep 07, 2016 by bergquist
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 0 deletions

CHANGELOG.md
+1 -0

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * **Database**: Allow database config using one propertie, closes [#5456](https://github.com/grafana/grafana/pull/5456)
 * **Graphite**: Add support for groupByNode, closes [#5613](https://github.com/grafana/grafana/pull/5613)
 * **Influxdb**: Add support for elapsed(), closes [#5827](https://github.com/grafana/grafana/pull/5827)
+* **OAuth**: Add support for generic oauth, closes [#4718](https://github.com/grafana/grafana/pull/4718)

 ### Breaking changes
 * **SystemD**: Change systemd description, closes [#5971](https://github.com/grafana/grafana/pull/5971)