Skip to content
Commit 51a6764f authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into cleanup-list-code 

Conflicts:
	apps/files_sharing/ajax/list.php
parents 2c483fdc b6d2d632
Expand all 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