Merge branch 'hotfix/1.0.20' v1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:01:25 +0000 (13:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:01:25 +0000 (13:01 -0400)
commitdde7dbf377e72a04e3f57b4bc4d37731432f2c92
tree676bc7fc7265c9661467efc926373600bde7603d
parentbfe7a2043e1671ae677c5e7fd7adefc042503eaf
parentb69f1669186acb23246952ce614d1d1f98aa6aa4
Merge branch 'hotfix/1.0.20'