Merge tag 'v1.1.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Jan 2017 18:40:02 +0000 (13:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Jan 2017 18:40:02 +0000 (13:40 -0500)
commit1f763485e63d60e03516756123f2d5653be5e597
tree068d7a72bb22b200fb2d177bcc37d26bd71641b6
parenta3477f4490247e987457d9e35b70e6a0094b3a6f
parent945f068a6e5ce3f0f60d0e258525d638c4ce57c1
Merge tag 'v1.1.12' into develop

Version 1.1.12
templates/template.html