Conflicts: apps/files_external/templates/settings.php lib/template.php |
||
|---|---|---|
| .. | ||
| ajax | ||
| appinfo | ||
| css | ||
| js | ||
| lib | ||
| templates | ||
| tests | ||
| personal.php | ||
| settings.php | ||
Conflicts: apps/files_external/templates/settings.php lib/template.php |
||
|---|---|---|
| .. | ||
| ajax | ||
| appinfo | ||
| css | ||
| js | ||
| lib | ||
| templates | ||
| tests | ||
| personal.php | ||
| settings.php | ||