Merge branch 'hotfix/1.2.42' v1.2.42
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Nov 2018 18:15:13 +0000 (13:15 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Nov 2018 18:15:13 +0000 (13:15 -0500)
commitd5880aebb7ce797418d8526aca0557db96422dc9
tree7906d6f0b1fe55e638427058e01dcf298d46b9ce
parent01d53808d5f63359cfab86546a307a9cbaf3c4f3
parent6295e0e6e103be5b38b573804cfcddd09481090a
Merge branch 'hotfix/1.2.42'