Merge branch 'hotfix/1.2.2' v1.2.2
authorLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jul 2016 15:42:06 +0000 (11:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jul 2016 15:42:06 +0000 (11:42 -0400)
commitbfc4cb8be4603d216fe5297538afb86b13f6234a
treee673e85baa54861c6120639f8924ca135873e8f5
parent162d2cfad647815126809503488fe01dc0ca47c3
parent5daac011976c71480a588ab1049e044ce1d0be80
Merge branch 'hotfix/1.2.2'