Skip to content
GitLab
Explore
Sign in
Commit
9671ace3
authored
Jan 06, 2013
by
Thomas Müller
Browse files
Merge branch 'master' into fix_minor_files_annoyances
Conflicts: apps/files/js/files.js
parents
9cd7bb2c
08d7b8ce
Changes
196
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