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)
Version 1.1.12

1  2 
templates/template.html

Simple merge