6081bfa2bc
Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php |
||
---|---|---|
.. | ||
ajax | ||
css | ||
img | ||
js | ||
l10n | ||
lostpassword | ||
templates | ||
minimizer.php | ||
routes.php | ||
strings.php |
6081bfa2bc
Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php |
||
---|---|---|
.. | ||
ajax | ||
css | ||
img | ||
js | ||
l10n | ||
lostpassword | ||
templates | ||
minimizer.php | ||
routes.php | ||
strings.php |