Merge branch 'hotfix/1.2.18' V1.2.18
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 16:26:31 +0000 (12:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 16:26:31 +0000 (12:26 -0400)
commit8013d06b850656242823915308edaa6263de125f
treeb3ef33b52c39fed7eabb611689e7bf9ad13a6b51
parente5f04176494b22d558204f8aa0c7eed8c8d4a635
parent4e3c5e90ed7e909808d5d2b9ac92284b3e1eb9c4
Merge branch 'hotfix/1.2.18'