Skip to content
Commit 41fa65e7 authored by hkjolhede's avatar hkjolhede
Browse files

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

Conflicts:
	apps/files_external/appinfo/app.php
parents b1b2eafa ec829bd3
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