Merge branch 'hotfix/1.2.11' v1.2.11
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 25 May 2017 19:07:40 +0000 (15:07 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 25 May 2017 19:07:40 +0000 (15:07 -0400)
commit76cdc8c33dcdeeb013a2fda4e29123d518203dde
treecb2681dc84023f23626119f991642434eadd7f3e
parent8d8f88fa62035f9b20efb252a7a7272cdd086fff
parent613bcf6fcf350948240c9dcfd7910e5f23c3c839
Merge branch 'hotfix/1.2.11'