Merge branch 'hotfix/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 Sep 2017 12:39:18 +0000 (08:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 Sep 2017 12:39:18 +0000 (08:39 -0400)
commitfd9f406d2306348b5c2ca2112767ea640a1dff2c
treeb9afa26691956d61517ee42365d311d8f74fcd5b
parentf8b08cbb3f139622b37f1df33791b400bcb0dcb6
parent9fb2c612130801989e764f0601a3cd7b65a6defe
Merge branch 'hotfix/1.0.14'