Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

d8b7e42f

Commit d8b7e42f authored 11 years ago by Victor Dubiniuk

Downloads
- Plain Diff

Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes

File conflicts dialog fixes

parents b48dffa9 4ccbace6

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

apps/files/js/file-upload.js 0 additions, 20 deletions

apps/files/js/file-upload.js
apps/files/js/fileactions.js 1 addition, 14 deletions

apps/files/js/fileactions.js
apps/files/js/filelist.js 1 addition, 1 deletion

apps/files/js/filelist.js
apps/files/js/files.js 4 additions, 4 deletions

apps/files/js/files.js
apps/files/templates/index.php 0 additions, 2 deletions

apps/files/templates/index.php
core/js/oc-dialogs.js 1 addition, 1 deletion

core/js/oc-dialogs.js

with 7 additions and 42 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment