Skip to content
Unverified Commit 739efd06 authored by Joas Schilling's avatar Joas Schilling Committed by GitHub
Browse files

Merge pull request #4374 from nextcloud/bugfix/4366/only-conflict-with-calls 

Only show the conflict warning when the session was in a call
parents 675eb3c2 7baf0bfd
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment