Merge tag 'v1.2.0' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Feb 2019 14:59:10 +0000 (09:59 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Feb 2019 14:59:10 +0000 (09:59 -0500)
commit888d2550caebccb26782bb7b255da978385a5925
treecff14eb2066c811817d78dbacd2eec65f312fc1d
parent75cbc57bed224a156cbacc6a0c5f062a6ee54cc3
parent748de3db6c9b4b6a8a622f2946d6984b796bee68
Merge tag 'v1.2.0' into develop

Smarty tag updates and other fixes.