Merge tag 'v1.2.42' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 22 Nov 2017 20:15:16 +0000 (15:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 22 Nov 2017 20:15:16 +0000 (15:15 -0500)
commit88613780f77a3ca773016e19f4e652fdbe2b5bb9
tree0ffece3b1d86e0f87596b60bcfa6890ddbf9779e
parent0a20a6f3c1cda45aad97642d7dca075a81e9d66c
parent08f22acc96046e684410b4003a9f2a4b134d7241
Merge tag 'v1.2.42' into develop

v1.2.42