test_context.py
12.3 KB
-
Merge branch 'development' of https://github.com/defunkt/pystache into development · 012bdba1
Conflicts: pystache/context.py pystache/tests/test_context.py pystache/tests/test_renderengine.py tests/common.py
Rodrigo Bernardo Pimentel committed