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

Merge branch 'master' into mobile-style 

Conflicts:
	apps/files/js/files.js
	apps/files_sharing/css/public.css
	apps/files_sharing/js/public.js
	apps/files_sharing/templates/public.php
parents 4ec6debe 4474421a
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