Merge branch 'hotfix/1.2.31' v1.2.31
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 15:06:11 +0000 (10:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 15:06:11 +0000 (10:06 -0500)
commit72e8514f91b2a7bbf2c32b2a92ed7787efd97a78
tree5ef1859000786514868c02443a34671e193bb13f
parent232ceb25767a15a093494a3f6e17765e75901a03
parent4d3277809429e8d353d8abfa77fec55862f34b41
Merge branch 'hotfix/1.2.31'