Skip to content
GitLab
Explore
Sign in
Commit
099b71c7
authored
Jan 30, 2014
by
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
Changes
857
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment