Merge branch 'hotfix/1.2.32' v1.2.32
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 15:35:49 +0000 (10:35 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 15:35:49 +0000 (10:35 -0500)
commitfb7d6835348bddadaac923647a72e969e285d292
treea072258f81df0bb138f6e85a1d17294fe6955985
parent72e8514f91b2a7bbf2c32b2a92ed7787efd97a78
parent9c80d66d8fe3072e656a768ce4b0842ff7e1fa53
Merge branch 'hotfix/1.2.32'