b5889d6ffe
Conflicts: apps/files_external/templates/settings.php lib/template.php |
||
---|---|---|
.. | ||
album.php | ||
hooks_handlers.php | ||
images_utils.php | ||
managers.php | ||
photo.php | ||
scanner.php | ||
sharing.php | ||
tiles.php | ||
tiles_test.php |
b5889d6ffe
Conflicts: apps/files_external/templates/settings.php lib/template.php |
||
---|---|---|
.. | ||
album.php | ||
hooks_handlers.php | ||
images_utils.php | ||
managers.php | ||
photo.php | ||
scanner.php | ||
sharing.php | ||
tiles.php | ||
tiles_test.php |