Conflicts: lib/private/image.php lib/private/l10n.php lib/private/request.php lib/private/share/mailnotifications.php lib/private/template/base.php |
||
|---|---|---|
| .. | ||
| base.php | ||
| cssresourcelocator.php | ||
| functions.php | ||
| jsresourcelocator.php | ||
| resourcelocator.php | ||
| templatefilelocator.php | ||