diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-06-06 17:01:18 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-06-06 17:01:18 +0300 |
| commit | 66ae668cd0abf5213475231e4a4057d9df2eccf1 (patch) | |
| tree | ff213038f0ba59322b83b2ddf3337d905c2f93cd /lib/Db | |
| parent | 68152421cdfac78c664cfc6365427004684ce1a2 (diff) | |
Fix conflict handling in tiptap
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/Db')
| -rw-r--r-- | lib/Db/Document.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Db/Document.php b/lib/Db/Document.php index 07a1e64ce..e1d0965ee 100644 --- a/lib/Db/Document.php +++ b/lib/Db/Document.php @@ -50,6 +50,7 @@ class Document extends Entity implements \JsonSerializable { 'currentVersion' => $this->currentVersion, 'lastSavedVersion' => $this->lastSavedVersion, 'lastSavedVersionTime' => $this->lastSavedVersionTime, + 'baseVersionEtag' => $this->baseVersionEtag, ]; } |