Skip to content
Commit 7d7eab61 authored by Marius Blüm's avatar Marius Blüm Committed by GitHub
Browse files

Merge pull request #85 from nextcloud/downstream-160614 

Downstream 16-06-14
parents da5bc709 ae02685e
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