Skip to content
Unverified Commit f03aa048 authored by Roeland Jago Douma's avatar Roeland Jago Douma Committed by GitHub
Browse files

Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251 

Fix silent conflicts due to merging #7256 after #7251
parents 6097b749 0c457782
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