Skip to content
Commit 099b71c7 authored by Pellaeon Lin's avatar Pellaeon Lin
Browse files

Merge branch 'master' into pr-exceed_upload_limit_msg 

Conflicts:
	apps/files/templates/index.php
	apps/files_sharing/templates/public.php
parents 929c930b 299a8285
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