Skip to content
GitLab
Explore
Sign in
Commit
09b54ccb
authored
May 28, 2013
by
Florin Peter
Browse files
Merge branch 'master' into remove_unused_vars
Conflicts: apps/files_encryption/lib/session.php apps/files_encryption/lib/util.php
parents
3a76c223
086c33ef
Changes
550
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