Skip to content
GitLab
Explore
Sign in
Commit
313631ed
authored
May 30, 2013
by
Florin Peter
Browse files
Merge branch 'master' into file_encryption_external_storage_fixes
Conflicts: apps/files_encryption/hooks/hooks.php
parents
1337f48d
2ce555fe
Changes
18
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