Skip to content
Unverified Commit ade73c3e authored by Tobias Kaminsky's avatar Tobias Kaminsky Committed by GitHub
Browse files

Merge pull request #5822 from nextcloud/conflictToast 

Fix crash while showing ConflictDialog
parents 676e4109 949a5c3a
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