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

Downstream 2016-06-08 #25

Merged
merged 32 commits into from
Jun 9, 2016
Merged

Downstream 2016-06-08 #25

merged 32 commits into from
Jun 9, 2016

Conversation

blizzz
Copy link
Member

@blizzz blizzz commented Jun 8, 2016

Downstream from ownCloud master

@blizzz blizzz added enhancement 3. to review Waiting for reviews labels Jun 8, 2016
@blizzz blizzz added this to the Nextcloud 10 milestone Jun 8, 2016
@MariusBluem
Copy link
Member

MariusBluem commented Jun 8, 2016

implement specific rename handling for SMB is already done in Nextcloud with #24 😉 ...will this cause conflicts and how do we handle such duplicates in the future 😁

@LukasReschke
Copy link
Member

...will this cause conflicts

It will work fine here. Git is clever enough for that 😉

and how do we handle such duplicates in the future 😁

Somebody manually has to rebase 🙈

SergioBertolinSG and others added 25 commits June 9, 2016 13:50
Prevents timeouts on the initial loading of users. proper fix will be in owncloud/core#10994
Workaround for owncloud/core#24734
@Bevito Bevito mentioned this pull request Oct 12, 2022
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.