From 2346c7f28163af41bc5283808adaea1ab633c1e8 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Tue, 22 Mar 2016 14:45:17 +0100
Subject: guides, sync 5.0 release notes with changelogs

[ci skip]

Sync AV, AR, AJ, AS, AM changelogs with our 5.0 release notes draft.
This is a follow up to c94045d and contains changes made since the
release of beta1.
---
 activerecord/CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'activerecord')

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index f854c106e8..e315a560c0 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,6 +1,7 @@
 *   Execute default_scope defined by abstract class in the context of subclass.
 
-    Fixes #23413 & #10658
+    Fixes #23413.
+    Fixes #10658.
 
     *Mehmet Emin İNAÇ*
 
-- 
cgit v1.2.3