Merge branch 'master' into redux-poc2

2018-09-10 09:32:06 +02:00
parent 6bdaf57ae7 7a117a6b6c
commit 035b0ab07a
2 changed files with 6 additions and 2 deletions
@@ -94,6 +94,10 @@ These are new features that's still being worked on and are in an experimental p
 * **Frontend**: Convert all Frontend Karma tests to Jest tests [#12224](https://github.com/grafana/grafana/issues/12224)
 * **Backend**: Upgrade to golang 1.11 [#13030](https://github.com/grafana/grafana/issues/13030)

+# 5.2.4 (2018-09-07)
+
+* **GrafanaCli**: Fixed issue with grafana-cli install plugin resulting in corrupt http response from source error. Fixes [#13079](https://github.com/grafana/grafana/issues/13079)
+
 # 5.2.3 (2018-08-29)

 ### Important fix for LDAP & OAuth login vulnerability
@@ -1,4 +1,4 @@
 {
-  "stable": "5.2.3",
-  "testing": "5.2.3"
+  "stable": "5.2.4",
+  "testing": "5.2.4"
 }