Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Wed, 1 Jun 2016 18:11:27 +0000 (14:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 1 Jun 2016 18:11:27 +0000 (14:11 -0400)
commitaaa62ec249f57f8f90c39567c738ace4bcae6a08
tree41f1ce274c67d845e5c73b978660692abd4d3800
parente78bcc335f90706c8ab72b3b105056579a919724
parentf0bb53b240b82133a3863ceac378acaf8f9e29e9
Merge branch 'hotfix/1.0.5'