Merge tag 'v1.1.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 20:56:52 +0000 (16:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 20:56:52 +0000 (16:56 -0400)
commiteb6f6ed0f24cb6aa4fb08cc12df5518bbc852206
tree657154163115e9271265edcf2b5d5dafdb5a2784
parent22e02fc93567ff4e9869d56f5635cd706bc8e3ca
parentfee0357fb32065b1befef42a95f05defe4407eb1
Merge tag 'v1.1.7' into develop

v1.1.7