Skip to content
GitLab
Explore
Sign in
Commit
f6e8a388
authored
Sep 23, 2013
by
Björn Schießle
Browse files
Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts: settings/ajax/changepassword.php
parents
82cbbb8a
9851f0f4
Changes
699
Expand all
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