Merge branch 'hotfix/1.1.7' v1.1.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 6 Sep 2016 12:10:34 +0000 (08:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 6 Sep 2016 12:10:34 +0000 (08:10 -0400)
commitd21480e84327154fa23e151e5705740659112c8f
treedf59153fe117aaca584a3614e9fd3c3973730d55
parent890dcdaf93a0421a4f17dfed7a9f8ed7912fb9ec
parentfe291961bd1e98756fb66b02cf6d087a0a1842aa
Merge branch 'hotfix/1.1.7'