Merge branch 'hotfix/1.1.4' v1.1.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:36:40 +0000 (16:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:36:40 +0000 (16:36 -0400)
commitcb768c49df915607ea0e2ced47736f2d17132485
tree540ef65943518072e942d2072e39ee3fbae3bd3a
parente3de5ae0c1a189c460d8c621b6560ab3ce4e926e
parent164c44860da90e4ecebf78d57e2627748de8d8fa
Merge branch 'hotfix/1.1.4'