summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-03-21 18:58:31 -0400
committerChris McDonough <chrism@plope.com>2012-03-21 18:58:31 -0400
commit036a633c5414887cc7c080c9d2ab813f539bd14a (patch)
tree19d19b946405e6add8cd7886190948978e42f5a4 /CHANGES.txt
parent731d5f571c2b78a885e176abfd0c16f78ec6bc02 (diff)
parenteb33944d0d861bbb3aebdf069cce64f8c1c3faef (diff)
downloadpyramid-036a633c5414887cc7c080c9d2ab813f539bd14a.tar.gz
pyramid-036a633c5414887cc7c080c9d2ab813f539bd14a.tar.bz2
pyramid-036a633c5414887cc7c080c9d2ab813f539bd14a.zip
Merge branch '1.3-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 916deb009..e978f61f0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.3 (2012-03-21)
+================
Bug Fixes
---------