Merge branch 'update-changelog' into 'master'

Fix CHANGELOG. cc: @stanhu See merge request !6505

Merge branch 'update-changelog' into 'master'
Fix CHANGELOG. cc: @stanhu See merge request !6505
6602b917 · Rubén Dávila Santos · 513629f3 · 8e15ded1 · 6602b917
Commit 6602b917 authored Sep 24, 2016 by Rubén Dávila Santos
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

CHANGELOG CHANGELOG +4 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,8 +3,11 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.13.0 (unreleased)
  - Speed-up group milestones show page

-v 8.12.1 (unreleased)
+v 8.12.2 (unreleased)
+
+v 8.12.1
  - Fix a memory leak in HTML::Pipeline::SanitizationFilter::WHITELIST
+  - Fix issue with search filter labels not displaying

 v 8.12.0
  - Update the rouge gem to 2.0.6, which adds highlighting support for JSX, Prometheus, and others. !6251