Merge branch 'master' into 138617379_best_comments

This commit is contained in:
Wyatt Johnson
2017-03-01 16:47:03 -07:00
committed by GitHub
44 changed files with 529 additions and 387 deletions
@@ -20,6 +20,10 @@ describe('coral-plugin-history/CommentHistory', () => {
'closedAt':null
};
comments.forEach((comment) => {
comment.asset = asset;
});
beforeEach(() => {
render = shallow(<CommentHistory comments={comments} asset={asset} link={()=>{}}/>);
});