summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-12-10 10:29:47 +0100
committerGeorg Brandl <georg@python.org>2013-12-10 10:29:47 +0100
commit96f062b3797c7f6c079f164fa1e400cb81e380ed (patch)
tree9777afc939513fd08311f8eb24861682bf115bcf /CHANGES
parent131dda3818243f6f18d75f415ef19a56d9b3a010 (diff)
parentcead46f17e8f06fa4a9e1600e3ad5224903e7b47 (diff)
downloadsphinx-96f062b3797c7f6c079f164fa1e400cb81e380ed.tar.gz
merge with stable
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 04985d00..a113c33a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Release 1.2.1 (in development)
+==============================
+
+
Release 1.2 (released Dec 10, 2013)
===================================