From 2760f3898b7e931aa71153852dcd48a75c9b95db Mon Sep 17 00:00:00 2001 From: Jan Sorgalla Date: Thu, 22 Dec 2016 15:09:01 +0100 Subject: [PATCH] Prepare changelog for v2.5.0 release --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 266fc644..4886f96c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ CHANGELOG for 2.x ================= -* 2.5.0 (xxxx-xx-xx) +* 2.5.0 (2016-12-22) * Revert automatic cancellation of pending collection promises once the output promise resolves. This was introduced in 42d86b7 (PR #36, released @@ -23,7 +23,8 @@ CHANGELOG for 2.x }); } ``` - * `all()` and `map()` functions now preserve the order of the array. + * `all()` and `map()` functions now preserve the order of the array (#77). + * Fix circular references when resolving a promise with itself (#71). * 2.4.1 (2016-05-03)