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.

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

Jump to bottom

[stable18] Perform file conflict check earlier so that it also triggers when not saving #876

Merged
merged 1 commit into from
Jun 16, 2020
Merged

[stable18] Perform file conflict check earlier so that it also triggers when not saving #876

merged 1 commit into from
Jun 16, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #871

@juliusknorr @backportbot
Perform file conflict check earlier so that it also triggers when not…
a2ab5b1 
… saving

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@backportbot-nextcloud backportbot-nextcloud bot added the bug Something isn't working label Jun 16, 2020
@backportbot-nextcloud backportbot-nextcloud bot added this to the 18.0.1 milestone Jun 16, 2020
@juliusknorr juliusknorr merged commit 05b1cc9 into stable18 Jun 16, 2020
@juliusknorr juliusknorr deleted the backport/871/stable18 branch June 16, 2020 08:49
@rullzer rullzer mentioned this pull request Jul 6, 2020
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliusknorr juliusknorr juliusknorr approved these changes

@rullzer rullzer Awaiting requested review from rullzer

Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
18.0.1
Development

Successfully merging this pull request may close these issues.
1 participant
@juliusknorr