summaryrefslogtreecommitdiff
path: root/RELEASES.txt
diff options
context:
space:
mode:
authorJames Tanner <tanner.jc@gmail.com>2014-03-10 18:55:17 -0400
committerJames Tanner <tanner.jc@gmail.com>2014-03-10 18:55:17 -0400
commit7b6d5e7bbf38a44bd8a4616138a1b2d5b1dfc540 (patch)
tree5b371c100bf6bbc743b6e92b053c1938a7325717 /RELEASES.txt
parent2fa6110961613b40906614abf5f3d83d23c081ae (diff)
parent16c05cbc8892041cacba3ff87c86e68b86b4511b (diff)
downloadansible-7b6d5e7bbf38a44bd8a4616138a1b2d5b1dfc540.tar.gz
Fix merge conflicts from 1.5.1 release notes
Diffstat (limited to 'RELEASES.txt')
-rw-r--r--RELEASES.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/RELEASES.txt b/RELEASES.txt
index c909346c7e..3537d1e838 100644
--- a/RELEASES.txt
+++ b/RELEASES.txt
@@ -14,6 +14,9 @@ Active Development
Previous
++++++++
+=======
+1.6 "The Cradle Will Rock" - NEXT
+1.5.1 "Love Walks In" -------- 03-10-2014
1.5 "Love Walks In" -------- 02-28-2014
1.4.5 "Could This Be Magic?" - 02-12-2014
1.4.4 "Could This Be Magic?" - 01-06-2014