Commit b95966e9 by David Baumgold

Merge branch 'release'

Conflicts:
	CHANGELOG.rst
parents cba08d0b 6416949b
Markdown is supported
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