Merge branch 'hotfix/1.1.29' v1.1.29
authorLaury GvR <laury@gaslightmedia.com>
Fri, 20 Apr 2018 16:05:55 +0000 (12:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 20 Apr 2018 16:05:55 +0000 (12:05 -0400)
commit598803eb83f293bc78002747ce2dca1030a40445
tree56f1be4c69eb3c348de01038d8f966214112af0f
parent3d56eb42c1b5500b329397728da18ec45c97ee66
parent9be8ebe6ca4099a649e57b8995d28c4e02ca6dcc
Merge branch 'hotfix/1.1.29'