Skip to content
Browse files

Merge branch '2.5-maintenance'

Conflicts:
	CHANGES
	setup.py
  • Loading branch information...
2 parents bb09fb2 + 1116573 commit 64ff4fa4f5110358f0fea236c600a13dc00c7909 @mitsuhiko committed
Showing with 8 additions and 1 deletion.
  1. +7 −0 CHANGES
  2. +1 −1 MANIFEST.in
View
7 CHANGES
@@ -5,6 +5,13 @@ Version 2.6
-----------
(codename to be selected, release date to be announced)
+Version 2.5.5
+-------------
+(re-release of 2.5.4 with built documentation removed for filesize.
+ Released on October 18th 2010)
+
+- built documentation is no longer part of release.
+
Version 2.5.4
-------------
(bugfix release, released on October 17th 2010)
View
2 MANIFEST.in
@@ -5,7 +5,7 @@ recursive-include ext *
recursive-include artwork *
recursive-include examples *
recursive-include jinja2/testsuite/res *
-recursive-exclude docs/_build/doctrees *
+recursive-exclude docs/_build *
recursive-exclude jinja2 *.pyc
recursive-exclude docs *.pyc
recursive-exclude jinja2 *.pyo

0 comments on commit 64ff4fa

Please sign in to comment.
Something went wrong with that request. Please try again.