Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 1 Jun 2016 18:09:07 +0000 (14:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 1 Jun 2016 18:09:07 +0000 (14:09 -0400)
commite78bcc335f90706c8ab72b3b105056579a919724
treef7dc3103b00112f03c99ae4c4c05497f190a74ab
parentacf8002591e4d71b74d0a792b4594b431a011413
parent4aeb12cbd1a6329998b0c216c7ff5580b0eb9080
Merge branch 'hotfix/1.0.4'