Skip to content
Commit e6895cb3 authored by Lukas Reschke's avatar Lukas Reschke Committed by GitHub
Browse files

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

[master] sync upstream - 21.06.2016
parents b4df57f3 2b493e2f
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