Merge branch '1.1.x'

This commit is contained in:
David Lord 2020-04-03 10:25:51 -07:00
commit 96b4dcafc3
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
6 changed files with 34 additions and 31 deletions

View file

@ -57,4 +57,4 @@ from .signals import template_rendered
from .templating import render_template
from .templating import render_template_string
__version__ = "1.2.0.dev0"
__version__ = "1.2.0.dev"