Merge branch 'hotfix/1.2.40' 1.2.40
authorlaury <laury@gaslightmedia.com>
Fri, 9 Nov 2018 16:09:48 +0000 (11:09 -0500)
committerlaury <laury@gaslightmedia.com>
Fri, 9 Nov 2018 16:09:48 +0000 (11:09 -0500)
commitc1fc09416a6534866f3c1c8faa7a54e089bfd8a1
tree840f2a25df9f7b00741156c97cf5bd8190f3c0af
parent49d8ec681bc309ae57d90986223978f5bcf2263d
parent8e3775f1d82895f27db30acc92ccb54c4c23b2ec
Merge branch 'hotfix/1.2.40'