Merge branch 'update-changelog' into 'master'

Fix CHANGELOG. See merge request !759

Merge branch 'update-changelog' into 'master'
Fix CHANGELOG. See merge request !759
47317f18 · Rubén Dávila Santos · d29bbb17 · b845217c · 47317f18
Commit 47317f18 authored Sep 24, 2016 by Rubén Dávila Santos
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

CHANGELOG-EE CHANGELOG-EE +6 -1

No files found.
--- a/CHANGELOG-EE
+++ b/CHANGELOG-EE
 Please view this file on the master branch, on stable branches it's out of date.

-v 8.12.1 (unreleased)
+v 8.13.0 (unreleased)
+
+v 8.12.2 (unreleased)
+
+v 8.12.1
+- Prevent secrets to be pushed to the repository

 v 8.12.0
  - Include more data in EE usage ping