Merge branch 'master' into toxicity-detail

Conflicts:
	plugin-api/beta/client/components/index.js
This commit is contained in:
Chi Vinh Le committed 2017-10-02 22:27:57 +07:00
commit 1c16a75f6b
20 files changed
+104 -78

No files matched your search

@@ -5,3 +5,4 @@ export {default as IfSlotIsNotEmpty} from 'coral-framework/components/IfSlotIsNo
export {default as CommentAuthorName} from 'coral-framework/components/CommentAuthorName';
export {default as CommentTimestamp} from 'coral-framework/components/CommentTimestamp';
export {default as CommentDetail} from 'coral-framework/components/CommentDetail';
export {default as CommentContent} from 'coral-framework/components/CommentContent';