Fix CHANGELOG entries

8734b08e · Robert Speicher · 84e215c5 · 8734b08e · 8734b08e
Commit 8734b08e authored 9 years ago by Robert Speicher
--- a/CHANGELOG
+++ b/CHANGELOG
 Please view this file on the master branch, on stable branches it's out of date.
  
-v 7.14.2
-  - Fix the rebase before merge feature
-
 v 7.14.1
  - 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)

--- a/CHANGELOG-EE
+++ b/CHANGELOG-EE
+v 7.14.2
+  - Fix the rebase before merge feature
+
 v 7.14.1
  - Fix sign in form when just Kerberos is enabled