Merge branch 'hotfix/1.1.7' master
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 19:20:57 +0000 (15:20 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 19:20:57 +0000 (15:20 -0400)
commit2feb54be6fee64c5272b65d1a1292982cfa68e47
tree1af76dadb02ab1959ec044911159d50c57fd29c3
parent96c0b92dc8871e55bc140090b683abfe995a47c2
parent60b911d269034b9922bf7db34f8648f0b9a8b30e
Merge branch 'hotfix/1.1.7'