41a74e3dd2
Conflicts: settings/personal.php |
||
---|---|---|
.. | ||
ajax | ||
appinfo | ||
css | ||
img | ||
js | ||
l10n | ||
templates | ||
admin.php | ||
apps.php | ||
help.php | ||
languageCodes.php | ||
log.php | ||
personal.php | ||
settings.php | ||
trans.png | ||
users.php |
41a74e3dd2
Conflicts: settings/personal.php |
||
---|---|---|
.. | ||
ajax | ||
appinfo | ||
css | ||
img | ||
js | ||
l10n | ||
templates | ||
admin.php | ||
apps.php | ||
help.php | ||
languageCodes.php | ||
log.php | ||
personal.php | ||
settings.php | ||
trans.png | ||
users.php |