Merge branch 'hotfix/1.1.2' v1.1.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Aug 2017 17:32:32 +0000 (13:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Aug 2017 17:32:32 +0000 (13:32 -0400)
commit2430b97b3e2d99531a0cbaef02fad03488c5eff8
tree45c5c58bb8b66ecb69d18801df6258cf865c24e3
parent0abbc7c33ceb1537d56f633b67680153c14efcd0
parentcd581e315683d84e35dd5790000afdd8a10307a0
Merge branch 'hotfix/1.1.2'