Merge branch 'hotfix/1.2.3' v1.2.3
authorLaury GvR <laury@gaslightmedia.com>
Mon, 12 Sep 2016 15:19:19 +0000 (11:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 12 Sep 2016 15:19:19 +0000 (11:19 -0400)
commit1e1ed669cba968444a5437de28dce60ed3fc0178
tree921b7cf42ffb5431370939f760c02fbffe275c5e
parentdf0c6ef1e479f590a752d6f409e10b5bbd1580f5
parenta8f168118730c0211e19cd53a114f99ef51f2866
Merge branch 'hotfix/1.2.3'