Merge master

app/models/Document.js

@@ -20,6 +20,7 @@ class Document extends BaseModel {
 
   collaborators: Array<User>;
   collection: $Shape<Collection>;
+  collectionId: string;
   firstViewedAt: ?string;
   lastViewedAt: ?string;
   modifiedSinceViewed: ?boolean;
@@ -38,6 +39,7 @@ class Document extends BaseModel {
   updatedBy: User;
   url: string;
   views: number;
+  revision: number;
 
   data: Object;
 
@@ -167,6 +169,7 @@ class Document extends BaseModel {
           id: this.id,
           title: this.title,
           text: this.text,
+          lastRevision: this.revision,
         });
       } else {
         if (!this.title) {

app/scenes/Document/Document.js

@@ -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}