Merge branch 'hotfix/1.2.12' v1.2.12
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 25 May 2017 19:13:26 +0000 (15:13 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 25 May 2017 19:13:26 +0000 (15:13 -0400)
commitfa4cda479e2047f271faf513275d22a35988bed4
tree60433b6f353ceca9b64fa44d1407fd66634c3925
parent76cdc8c33dcdeeb013a2fda4e29123d518203dde
parent23d0d6a110fbec3519b83c62a3a936f55e13baaf
Merge branch 'hotfix/1.2.12'