Skip to content
Commit 48265643 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 4cb5cb96 0aa6c1b1
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