Merge branch 'hotfix/1.0.24' v1.0.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 22 Feb 2018 21:15:16 +0000 (16:15 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 22 Feb 2018 21:15:16 +0000 (16:15 -0500)
commit44e0b1f58a55bc3bf694df4a2ad53d9dd70c2252
tree5fd5fcdf368448e2ff4106a4db8c226c162ae046
parentbecc23632d4a6cc4f751d2366bb9932647345e19
parent25261806d9c27707ca7a7fa72d8b31aa7b3d75f6
Merge branch 'hotfix/1.0.24'