Skip to content
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.

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

Fixes #607 #1275

Merged
merged 4 commits into from
Jul 22, 2019
Merged

Fixes #607 #1275

merged 4 commits into from
Jul 22, 2019

Conversation

ivyclare
Copy link
Contributor

Changed »Details…« to »View more activity…«

No changes were made in the following issues related to the issue because they seem to have already been resolved:

  • In case of conflict, the server file is downloaded and the local file is renamed to "filename_conflicted copy".
  • Most recently changed files already appear at the top.

Signed-off-by: ivyclare <ivolinengong@gmail.com>
@camilasan camilasan merged commit 0539e34 into nextcloud:master Jul 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants