summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-11-14 02:50:53 -0500
committerChris McDonough <chrism@plope.com>2012-11-14 02:50:53 -0500
commit3ae2a829c17ebe3dd1a2db547d9ad4cb39feb8cb (patch)
tree03006b197b63358eb65bfaa8bacaec614b6ec7d0 /CHANGES.txt
parent39ef68dbc196824f66796fa91ea1eeeaa96d7471 (diff)
parent948068688561806a321a17bfc15c87446a577b5b (diff)
downloadpyramid-3ae2a829c17ebe3dd1a2db547d9ad4cb39feb8cb.tar.gz
pyramid-3ae2a829c17ebe3dd1a2db547d9ad4cb39feb8cb.tar.bz2
pyramid-3ae2a829c17ebe3dd1a2db547d9ad4cb39feb8cb.zip
Merge branch '1.4-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 16dad95f1..9f5ce064f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.4a4 (2012-11-14)
+==================
Features
--------