Merge branch 'hotfix/1.0.36' v1.0.36
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Jun 2018 18:51:52 +0000 (14:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Jun 2018 18:51:52 +0000 (14:51 -0400)
commit7ef4126e70b821da94827c03288e377552b2ef8c
treec631eba7a4c430f8bbb15a1094fb6e1d02664f1a
parent4e379f8fada0671e6e3789740e315460b37ad279
parenteaf6f180e130c902d62391c385f34b67d30fe588
Merge branch 'hotfix/1.0.36'