Merge branch 'hotfix/1.2.32' v1.2.32
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 19:09:15 +0000 (14:09 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 19:09:15 +0000 (14:09 -0500)
commitb6a5fef2a74e7a6aba8d97247e78b080a635eed4
treedda13a30fc31507b0ef016eef0e2e8b1af6a616a
parenta6523d8a508142ec907d1572ab193035b323c89d
parent5931a3a5eac3b334fa3f5dd74f9f9ba237bc1f92
Merge branch 'hotfix/1.2.32'