From 451873963a4c41e0edeb066545cafcb9a0df9c19 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 24 Aug 2015 12:27:02 -0700
Subject: [PATCH] Move changelog entry to 7.14.1

[ci skip]
---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5137879d318..5940d586d88 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,6 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.0 (unreleased)
-  - Fix Error 500 in API when accessing a group that has an avatar (Stan Hu)
   - Remove user OAuth tokens from the database and request new tokens each session (Stan Hu)
   - Only show recent push event if the branch still exists or a recent merge request has not been created (Stan Hu)
   - Remove satellites
@@ -16,6 +15,7 @@ v 8.0.0 (unreleased)
 
 v 7.14.1 (unreleased)
   - Only include base URL in OmniAuth full_host parameter (Stan Hu)
+  - Fix Error 500 in API when accessing a group that has an avatar (Stan Hu)
 
 v 7.14.0
   - Fix bug where non-project members of the target project could set labels on new merge requests.