Merge branch 'hotfix/1.2.42' v1.2.42
authorLaury GvR <laury@gaslightmedia.com>
Wed, 22 Nov 2017 20:15:10 +0000 (15:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 22 Nov 2017 20:15:10 +0000 (15:15 -0500)
commit08f22acc96046e684410b4003a9f2a4b134d7241
tree0ffece3b1d86e0f87596b60bcfa6890ddbf9779e
parentfcbf0bfc22033e9f21ba8e438a41490153955586
parenta5e4517c9d49b933e6c3f0850f80d0aa75d933ef
Merge branch 'hotfix/1.2.42'