6081bfa2bc
Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php |
||
---|---|---|
.. | ||
ajax | ||
css | ||
img | ||
js | ||
l10n | ||
templates | ||
admin.php | ||
apps.php | ||
help.php | ||
languageCodes.php | ||
personal.php | ||
routes.php | ||
settings.php | ||
trans.png | ||
users.php |