Commit 50204d45 by Chris Jerdonek

Merge branch 'master' into development

parents 85c62766 b8a3d0c6
...@@ -10,4 +10,4 @@ from pystache.init import parse, render, Renderer, TemplateSpec ...@@ -10,4 +10,4 @@ from pystache.init import parse, render, Renderer, TemplateSpec
__all__ = ['parse', 'render', 'Renderer', 'TemplateSpec'] __all__ = ['parse', 'render', 'Renderer', 'TemplateSpec']
__version__ = '0.5.2-rc.1' # Also change in setup.py. __version__ = '0.5.2' # Also change in setup.py.
...@@ -97,7 +97,7 @@ else: ...@@ -97,7 +97,7 @@ else:
setup = dist.setup setup = dist.setup
VERSION = '0.5.2-rc.1' # Also change in pystache/__init__.py. VERSION = '0.5.2' # Also change in pystache/__init__.py.
FILE_ENCODING = 'utf-8' FILE_ENCODING = 'utf-8'
......
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