Merge branch 'hotfix/1.0.4' v1.0.4
authorIan Weller <ian@gaslightmedia.com>
Thu, 8 Jun 2017 18:11:50 +0000 (14:11 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 8 Jun 2017 18:11:50 +0000 (14:11 -0400)
commit310f5c7795094c165fbcccad9ac2c91dd68826f2
treebcd7714ab596c2cfb38555abd9e371b5829e96fd
parent88f97654734e2f45c2f1272f500f4df5d45db761
parentf18fe312badca294801b582527a3064444c6e017
Merge branch 'hotfix/1.0.4'