Skip to content
Commit 909569c2 authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' into feature/toml 

# Conflicts:
#	README.rst
#	setup.py
#	template/filters.py
#	tests.sh
parents 1f42a863 00a42412
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment