Merge branch 'hotfix/2.4.2' v2.4.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Mar 2017 15:39:26 +0000 (11:39 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Mar 2017 15:39:26 +0000 (11:39 -0400)
commit167e3bfd20892f6ee2838845384d712adffc72d2
tree608a2c8ce05438a821b4593dec998071f7ec6bf3
parentb098de869a78a4c0ede1113adab98ca357df6ded
parent337a73f2d486398d490cbafe6debd2137f20958b
Merge branch 'hotfix/2.4.2'