Merge master

This commit is contained in:
Tom Moor
2017-11-26 18:23:11 -08:00
6 changed files with 38 additions and 2 deletions

View File

@@ -232,7 +232,7 @@ class DocumentScene extends Component {
message={DISCARD_CHANGES}
/>
<Editor
key={document.id}
key={`${document.id}-${document.revision}`}
text={document.text}
emoji={document.emoji}
onImageUploadStart={this.onImageUploadStart}