Merge branch 'hotfix/1.1.5' v1.1.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 15:10:52 +0000 (10:10 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 15:10:52 +0000 (10:10 -0500)
commit20fbbbbabc02bf81b77a9789d8d141c59e5992bc
tree515c31427f3470c398b21f9132f9a1ae7d789da9
parentf32cd280471b0fa0e62432795a327b211cff8ef6
parent64387e545d4c24577f8a74ed90903e7b4056b145
Merge branch 'hotfix/1.1.5'