Skip to content
GitLab
Explore
Sign in
Commit
4c980a48
authored
Feb 25, 2013
by
Björn Schießle
Browse files
Merge branch 'master' into update-expire-function
Conflicts: apps/files_trashbin/appinfo/version apps/files_trashbin/lib/trash.php
parents
632ca9f0
a37577e0
Changes
13
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