Skip to content
GitLab
Explore
Sign in
Commit
2af6d74b
authored
Jan 31, 2013
by
Thomas Müller
Browse files
Merge branch 'master' into fixing-js-errors-public-link-master
Conflicts: apps/files/js/files.js apps/files/templates/part.list.php
parents
11e88f49
317261d6
Changes
685
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