Merge branch 'main' into fix/4600-prevent-race-condition

nextcloud · Nov 7, 2023 · 3a7fdbd · 3a7fdbd
2 parents 308d640 + 2bad2df
commit 3a7fdbd
Show file tree

Hide file tree

Showing 34 changed files with 7,012 additions and 6,506 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/js/editor-collab.js b/js/editor-collab.js
diff --git a/js/editor-collab.js.map b/js/editor-collab.js.map
diff --git a/js/editor-guest.js b/js/editor-guest.js
diff --git a/js/editor-guest.js.map b/js/editor-guest.js.map
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/files-modal.js b/js/files-modal.js