Skip to content
Commit b5989c93 authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

Merge branch 'master' into shared-folder-etags 

Conflicts:
	apps/files_sharing/lib/sharedstorage.php
parents ea83aced 93e713d3
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