diff options
author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-03-30 18:59:32 -0700 |
---|---|---|
committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-03-30 18:59:32 -0700 |
commit | 5ba98b3d39d1d52ab8bd7fb53cd2c10a7b9405fe (patch) | |
tree | 7e3320668d7f1ff4ed916268dc644a99961a9171 /HISTORY.rst | |
parent | e4c083f6fdd8c132bdcaeb4ff9466cc81acd9318 (diff) | |
parent | a06fd4233d55ea317ea03b81c98b149e3d5b1364 (diff) | |
download | pystache-5ba98b3d39d1d52ab8bd7fb53cd2c10a7b9405fe.tar.gz |
Merge branch 'master' into 'development': v0.4.1 changes
Conflicts:
HISTORY.rst
README.rst
examples/nested_context.py
pystache/template.py
setup.py
Diffstat (limited to 'HISTORY.rst')
-rw-r--r-- | HISTORY.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/HISTORY.rst b/HISTORY.rst index d867634..8ca8169 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -39,6 +39,10 @@ Misc: * Added some docstrings. [kennethreitz] +0.4.1 (2012-03-25) +------------------ +* Added support for Python 2.4. [wangtz, jvantuyl] + 0.4.0 (2011-01-12) ------------------ * Add support for nested contexts (within template and view) |