Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 Sep 2017 12:44:45 +0000 (08:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 Sep 2017 12:44:45 +0000 (08:44 -0400)
commit6ee75a13b9a6736c872e2e993094da8e7afcbe1d
tree4ab740f8f21d565fbdcec03c70fedbb1ac04171b
parentfd9f406d2306348b5c2ca2112767ea640a1dff2c
parent01bd36e56de7a73ab4ad27bd2cafe3ed4ff43464
Merge branch 'hotfix/1.0.15'