Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 11 Oct 2017 13:24:57 +0000 (09:24 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 11 Oct 2017 13:24:57 +0000 (09:24 -0400)
commit4847d0910d74e153dd4db42a955034c157c38bb5
tree62073a4328ce2b5b056f2a87358cfb22cc0e69d0
parent6c3ddba62ead44eca6f3004ec1d2c7ff89606e3b
parente7aed747df39759871634c46164eba70848a33c7
Merge branch 'hotfix/1.0.15'