Skip to content

[stable29] fix(files): Fix having to resolve conflicts twice when dropping files #48351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pytal merged 2 commits into from
Sep 25, 2024
Merged

[stable29] fix(files): Fix having to resolve conflicts twice when dropping files #48351

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1507877
fix(files): Fix having to resolve conflicts twice when dropping files
Pytal Sep 24, 2024
3d20d4e
chore(assets): Recompile assets
nextcloud-command Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
chore(assets): Recompile assets 
Signed-off-by: nextcloud-command <[email protected]>
  • Loading branch information
@nextcloud-command
nextcloud-command committed Sep 25, 2024
commit 3d20d4e48aa6654f0283782131004c70b4e2af0f
4 changes: 2 additions & 2 deletions dist/files-init.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-init.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.