Skip to content
GitLab
Explore
Sign in
Commit
7cfb0dc4
authored
Jun 13, 2013
by
Björn Schießle
Browse files
Merge branch 'master' into files_encryption_check_private_key
Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php
parents
20ddd6e1
dd801192
Changes
583
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