Skip to content
Commit b6397ef7 authored by Morris Jobke's avatar Morris Jobke Committed by GitHub
Browse files

Merge pull request #236 from nextcloud/master-sync-upstream 

[Master] sync upstream
parents 300f0965 6670d376
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