Merge branch 'hotfix/2.0.14' v2.0.14
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Oct 2016 13:25:46 +0000 (09:25 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Oct 2016 13:25:46 +0000 (09:25 -0400)
commit4642f4d79b6d6b673f0cfba5eb1a460517a30a7b
tree99d71cf79c32020c1b2c8b7d02ac106a68709279
parent04d3c6cbc9ec12ecae8bfa1f61a72a97b1f4ea6c
parent4ef132b9bf3363c3fe611e5361405a641854821e
Merge branch 'hotfix/2.0.14'