Merge branch 'hotfix/1.2.4'
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 17:52:02 +0000 (13:52 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 17:52:02 +0000 (13:52 -0400)
commit4a516e4f0efe9851301c812ff08f84abd5c04c24
tree32b90f8dd163c4abc8a56d75e0a2009c8563f8dc
parent1e1ed669cba968444a5437de28dce60ed3fc0178
parentbbc3da612ed3d9e36d467cd48e5f4a562ab73241
Merge branch 'hotfix/1.2.4'