Merge branch 'hotfix/1.2.5' v1.2.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 15 Aug 2016 20:14:04 +0000 (16:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 15 Aug 2016 20:14:04 +0000 (16:14 -0400)
commit0194c73a8b0d87cf2dd4abb0a222765950eeb4de
tree8c40969072acb70550ba7fb06acea9b9304d3298
parentb9a71225e03f5113658b389bb9be9323f3d4357f
parentf0849ee56067358c2a3f44b9fe5715c3669b04d6
Merge branch 'hotfix/1.2.5'