Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Fri, 1 Jun 2018 19:39:59 +0000 (15:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 1 Jun 2018 19:39:59 +0000 (15:39 -0400)
commit08212b200cc9386e018598f67f40133258ce0c28
tree9c098dbf24f036c3f33f476641cebbd27540b650
parentaab37dc31a6201aa37b2346b86c0e12f2d901717
parent5bcb013ea21b6832300e9d57224b57f23b276e27
Merge branch 'hotfix/1.0.15'