2c8e5ec84f
Conflicts: settings/templates/personal.php |
||
---|---|---|
.. | ||
ajax | ||
appinfo | ||
js | ||
l10n | ||
lib | ||
templates | ||
download.php | ||
index.php |
2c8e5ec84f
Conflicts: settings/templates/personal.php |
||
---|---|---|
.. | ||
ajax | ||
appinfo | ||
js | ||
l10n | ||
lib | ||
templates | ||
download.php | ||
index.php |