projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9164d04 2ae59b2)
Merged 2.3.1 in
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 18 Feb 2010 23:01:18 +0000 (00:01 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 18 Feb 2010 23:01:18 +0000 (00:01 +0100)
--HG--
branch : trunk

1  2 
.hgtags patch | diff1 | diff2 | blob | history

diff --cc .hgtags
index 26e90385b4d9c6f5c01d2e99c4010d0b9c892643,0a6bcdad423be3079bcc8807cdcc2367a3de5613..08f9c07fa3f8032f5920283e19a7c3ea255f6b04
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -4,4 -4,4 +4,5 @@@ bac88fe8bc0e50b321a04eea038ed4542c43a62
  ac0fc30f7b5ffca59769c5d9ed78f50596868af8 2.1.1
  45970e0ca3a809e098680cd1786158a6b1a48dba 2.2
  58325d0cdee32fe11c7768326b827df0610cb067 2.2.1
 +3d793a1f6346f0ae7059153f2d4d64c872e43050 2.3
+ cc4a105b7c0c6b9408431a59f68e85ac7241e082 2.3.1
The Jinja2 template engine, with 2to3 already run