Merge branch 'hotfix/1.5.7' v1.5.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 18 Nov 2016 17:56:08 +0000 (12:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 18 Nov 2016 17:56:08 +0000 (12:56 -0500)
commit90b72ebe435948b1e032527703f789db147bde9f
tree319a86a1c7b19aad691d5c7ddc681412b2d7d5a2
parent6aa5293d27526b3506b5358057891486bced9225
parent7d9890562f888dcfb7470f0a40df53829831100f
Merge branch 'hotfix/1.5.7'