Merge branch 'master' into toc

2017-10-17 20:02:51 -07:00
parent aa5b3baf27 af031d33ab
commit 6a398ddc9d
33 changed files with 169 additions and 580 deletions
--- a/frontend/components/Editor/Editor.js
+++ b/frontend/components/Editor/Editor.js
@@ -24,7 +24,7 @@ type Props = {
  onCancel: Function,
  onImageUploadStart: Function,
  onImageUploadStop: Function,
-  emoji: string,
+  emoji?: string,
  readOnly: boolean,
 };