Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 19 Apr 2016 20:22:24 +0000 (16:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 19 Apr 2016 20:22:24 +0000 (16:22 -0400)
commitaac7e98221f212d569d849f89faa2f61dc937e7d
tree3dc68092ca288d4677c1eadf72103f9da31c7976
parentcca13197fc881e08810be4fa7f0199389350ce1b
parentb250b8e31d2548592b21e119c0d8de7da1e94369
Merge branch 'hotfix/1.0.4'