diff options
| author | Chris McDonough <chrism@agendaless.com> | 2010-01-06 03:15:33 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2010-01-06 03:15:33 +0000 |
| commit | 96d63068ba033809ed73834e095f274800e4d4e8 (patch) | |
| tree | 697507770440bafa88ae40bb0b2bcee00983cbfd | |
| parent | 3ebf0287eeb8c269a7a3b35ee1441d1b07118d7f (diff) | |
| download | pyramid-96d63068ba033809ed73834e095f274800e4d4e8.tar.gz pyramid-96d63068ba033809ed73834e095f274800e4d4e8.tar.bz2 pyramid-96d63068ba033809ed73834e095f274800e4d4e8.zip | |
Prep for 1.2a11.
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index e6beb4700..11eeb9d29 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,5 @@ -Next Release -============ +1.2a11 (2010-01-05) +=================== Bug Fixes --------- @@ -14,6 +14,9 @@ Bug Fixes Features -------- +- Jython compatibility (at least when repoze.bfg.jinja2 is used as the + templating engine; Chameleon does not work under Jython). + - Show the derived abspath of template resource specifications in the traceback when a renderer template cannot be found. diff --git a/docs/conf.py b/docs/conf.py index 935bd386d..bb78d758d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -53,7 +53,7 @@ copyright = '2008-2010, Agendaless Consulting' # other places throughout the built documents. # # The short X.Y version. -version = '1.2a10' +version = '1.2a11' # The full version, including alpha/beta/rc tags. release = version @@ -12,7 +12,7 @@ # ############################################################################## -__version__ = '1.2a10' +__version__ = '1.2a11' import os import sys |