summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-30 15:13:09 -0400
committerChris McDonough <chrism@plope.com>2013-08-30 15:13:09 -0400
commitf21a765b0872468873061cf15400c54ddfedbaaa (patch)
treed0199183059ba1826f4e55513c381a1c0ba8cf0d /CHANGES.txt
parent891100b3ec95dc83dc09f0895af399c5b1061c88 (diff)
parent00bb95f513ddcedcaf025bb528e4d7f20b1f7a4b (diff)
downloadpyramid-f21a765b0872468873061cf15400c54ddfedbaaa.tar.gz
pyramid-f21a765b0872468873061cf15400c54ddfedbaaa.tar.bz2
pyramid-f21a765b0872468873061cf15400c54ddfedbaaa.zip
Merge branch '1.5-branch'
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index f7f7aa571..cdaad5a90 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next Release
-============
+1.5a1 (2013-08-30)
+==================
Features
--------