Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 21:38:13 +0000 (16:38 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 21:38:13 +0000 (16:38 -0500)
commit3e75a16858def0ed3b93e803bb953a324fe087ad
tree7453c91ed68d74097d51a5ae7fa5044132449e8a
parent9355f06128fe197eefeed8928f08b8c7c74a2c3e
parentbde45e15fb4c8d2fe51c78a80cfb39a6fd61eae0
Merge branch 'hotfix/1.0.5'