Skip to content

[13] Log lock state on conflict - #9389

Merged
MorrisJobke merged 2 commits into
stable13from
log-lock-state-on-conflict-13
May 7, 2018
Merged

[13] Log lock state on conflict#9389
MorrisJobke merged 2 commits into
stable13from
log-lock-state-on-conflict-13

Conversation

@icewind1991

Copy link
Copy Markdown
Member

Backport of #9388

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991icewind1991 added the 3. to review Waiting for reviews label May 4, 2018
@icewind1991icewind1991 added this to the Nextcloud 13.0.3 milestone May 4, 2018

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

@MorrisJobke
MorrisJobke merged commit 7bf713e into stable13May 7, 2018
@MorrisJobke
MorrisJobke deleted the log-lock-state-on-conflict-13 branch May 7, 2018 14:29
This was referenced May 31, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@icewind1991@nickvergessen@MorrisJobke