From c9613d4837d80da234b1d9d88d3f7521d51e1873 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Sun, 24 Jan 2016 17:02:45 -0800
Subject: collapse latest milestone releases in changelog

---
 CHANGELOG.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5ee21c..87d25bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,9 @@
-# Version 2.4.0-M2
-- Add support for armv6l
-
-# Version 2.4.0-M1
+# Version 2.4.0
 - Use sbt-jni plugin:
     - More platforms can now be supported in fat jar
     - Simplify build configuration
 - Create website
+- Add support for armv6l
 
 # Version 2.3.1
 - Upgrade Akka to 2.4.1
-- 
cgit v1.2.3