Skip to content
GitLab
Explore
Sign in
Commit
13017ce9
authored
Jun 10, 2013
by
Björn Schießle
Browse files
Merge branch 'master' into files_encryption_check_private_key
Conflicts: settings/ajax/changepassword.php
parents
b25ab94a
db06b906
Changes
696
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