Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 11 May 2017 12:48:00 +0000 (08:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 11 May 2017 12:48:00 +0000 (08:48 -0400)
commitd5e0cdd3c1c71ecfc983f8b80246b4b0e5495cf0
treed30450523bf74c2a568327171cc6cb33b51c2225
parent51c495dddc3cafa859107490824dab02878b6ea1
parent5bbc17adf52cd2d5c8520c0badb6ffc6ab1c431f
Merge branch 'hotfix/1.0.4'