Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 26 May 2016 21:30:59 +0000 (17:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 26 May 2016 21:30:59 +0000 (17:30 -0400)
commitd2a62ddc580fbda1ca8878dc1116bfa116fe90dc
tree90d10fb7fb446d9e8c6858f7789e62a663b5bcb6
parentc1778439eec8ab3e27cf068212f49f5d7a898ca2
parenta2d709256749c2debc1dd23f6d60ae17d980e098
Merge branch 'hotfix/1.0.4'