Merge branch 'hotfix/1.1.24' v1.1.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 13 Jul 2017 15:43:21 +0000 (11:43 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 13 Jul 2017 15:43:21 +0000 (11:43 -0400)
commit4a72b44e32a3cd6fc35929f2823cffe9b52f4f35
tree3b17ffefe0c43f7c310f9f05bb0ad72067286f83
parent22f7bd04a23f9637fb8398e5f0bd10cf6025d296
parenta9572b0a7ecb6b5c2aca404d748313d726e872df
Merge branch 'hotfix/1.1.24'