Skip to content
Snippets Groups Projects
Commit 3970d0e6 authored by Jörn Friedrich Dreyer's avatar Jörn Friedrich Dreyer
Browse files

Merge branch 'master' of github.com:owncloud/core

parents d91bd37b 16aff104
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment