Skip to content
GitLab
Explore
Sign in
Commit
18c80e47
authored
Nov 21, 2013
by
Björn Schießle
Browse files
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
Conflicts: apps/files_encryption/lib/stream.php
parents
b27fc42e
2b361ea0
Changes
2
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