Files · 012bdba1d29c37c3b0bbdd889ab7f6717c649856 · OpenEdx / pystache_custom · GitLab

History Find file

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 Apr 29, 2012
012bdba1

Name	Last commit	Last update
ext		Loading commit data...
pystache		Loading commit data...
tests		Loading commit data...
.gitignore		Loading commit data...
.gitmodules		Loading commit data...
HISTORY.rst		Loading commit data...
LICENSE		Loading commit data...
MANIFEST.in		Loading commit data...
README.rst		Loading commit data...
TODO.md		Loading commit data...
setup.py		Loading commit data...
test_pystache.py		Loading commit data...
tox.ini		Loading commit data...