Merge branch 'hotfix/1.0.18' v1.0.18
authorIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 17:42:36 +0000 (13:42 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 17:42:36 +0000 (13:42 -0400)
commit42a4ac0d0a473ba887f662d5bc436b5bbeb0883a
tree5470ae9c5956851574437c8a09c83cf359279665
parent90455dbb98c519087bf89f9bcba8b02759835619
parent4e651f5c5b629ae7670b1c2869a19f606b2837a4
Merge branch 'hotfix/1.0.18'