Merge branch 'hotfix/1.0.25' v1.0.25
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 17:24:01 +0000 (13:24 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 17:24:01 +0000 (13:24 -0400)
commitb8830fb47233a9b350ad730ad8f3b6c9e73f50c2
tree278d19de3c29a53a5b67c3865e711af40f4e4af5
parent7195ac695a5e854f3d32e903b555bddbdafe7a1a
parenteca480bc07be0d196e26cc7b7f1221e46b992adc
Merge branch 'hotfix/1.0.25'