Merge branch 'hotfix/2.0.26' v2.0.26
authorLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 19:19:14 +0000 (15:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 19:19:14 +0000 (15:19 -0400)
commit22c557bbfe675d95ad137d048a907ca4a1a5f7e4
tree337283431442735dc3b8597a3fc2b5926d993ff6
parentfa37d63c27b1dc0fd120855b7511833e03cf31bd
parent31a1b12cbe4881755f54d19b3c5e60c20dc649d8
Merge branch 'hotfix/2.0.26'