test_pystache.py
3.07 KB
-
Merge branch 'master' into development · c9dcb076
Conflicts: examples/inverted.py pystache/template.py tests/test_pystache.py tests/test_view.py
Carl Whittaker committed
Conflicts: examples/inverted.py pystache/template.py tests/test_pystache.py tests/test_view.py