Carl Whittaker c9dcb07630 Merge branch 'master' into development ...

Conflicts:
	examples/inverted.py
	pystache/template.py
	tests/test_pystache.py
	tests/test_view.py

2011-05-31 17:35:32 +01:00

..

test_examples.py

Moving context logic into view

2011-01-27 15:50:45 +00:00

test_loader.py

Adding template Loader class

2011-01-12 11:32:18 +00:00

test_pystache.py

Merge branch 'master' into development

2011-05-31 17:35:32 +01:00

test_simple.py

Reverting broken whitespace preservation logic that was pushed by mistake.

2011-02-11 17:08:27 +00:00

test_view.py

Merge branch 'master' into development

2011-05-31 17:35:32 +01:00