Merge branch 'hotfix/1.0.22' v1.0.22
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 20:14:56 +0000 (16:14 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 20:14:56 +0000 (16:14 -0400)
commitdb24e0aa9e8ce14336e0412732df52ca0ab0cb53
tree418727d386d3961c1387f346a44d992b395b0088
parente341a248bc2b9f19b23aabd721329121cd1c0f52
parentf6239b694d35ef774fe6c2ce669533d0e4e6ca17
Merge branch 'hotfix/1.0.22'