Skip to content
GitLab
Explore
Sign in
Commit
cabe92ef
authored
Aug 17, 2013
by
Björn Schießle
Browse files
Merge branch 'master' into decrypt_files_again
Conflicts: apps/files_encryption/tests/keymanager.php
parents
7adfc27c
d3e2f31a
Changes
1000
Hide whitespace changes
Inline
Side-by-side
Some changes are not shown.
For a faster browsing experience, only
20 of 1000+
files are shown. Download one of the files below to see all changes.
Plain diff
Email patch
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
