Merge branch 'hotfix/1.0.21' v1.0.21
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 12 Jun 2017 20:43:26 +0000 (16:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 12 Jun 2017 20:43:26 +0000 (16:43 -0400)
commit20b6df1bc5aa81d74036aad73bcc207925833626
treed4c85171c6540541fa54d51b3f5675ea0ba3fe64
parent7d51cca178d94cf79763e8c3ddcc69ccb10e69ce
parent0a914ef5ad11d093d81d7ddefcf08472972700e3
Merge branch 'hotfix/1.0.21'