Merge branch 'hotfix/1.0.36' v1.0.36
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Jan 2018 21:11:52 +0000 (16:11 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Jan 2018 21:11:52 +0000 (16:11 -0500)
commit62aba5987df04f83423a220c4b0e64bcd3f407d6
tree32cc9fbb0770a5459810d56c31445f29c1223589
parent233d81c134b1e7a943681e5b37ddf3f052c2d808
parentdbc9a075039de6a003a27691adeae648c2f99ba4
Merge branch 'hotfix/1.0.36'