setup.py
2.21 KB
-
Merge branch 'master' into 'development': v0.4.1 changes · 5ba98b3d
Conflicts: HISTORY.rst README.rst examples/nested_context.py pystache/template.py setup.py
Chris Jerdonek committed
Conflicts: HISTORY.rst README.rst examples/nested_context.py pystache/template.py setup.py