Fix merge conflicts from 1.5.1 release notes

This commit is contained in:
James Tanner
2014-03-10 18:55:17 -04:00
5 changed files with 29 additions and 2 deletions

View File

@@ -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