diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-09-01 17:40:01 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-09-01 17:40:01 +0000 |
| commit | 538df03dd14f93419209ef61107a674575828e25 (patch) | |
| tree | f5874b59fa616d538abaf08f9c9bf61724788bba /themes/admin_wind/views | |
| parent | 940f9330efca76c84e7a645cafc93acd2751a225 (diff) | |
| parent | 78c590ebaee738435260e3b0bf6cb8fb5431a08d (diff) | |
Manually merged changes to .htaccess file resolving conflicts due to my changes of the file.
Diffstat (limited to 'themes/admin_wind/views')
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index 6b0c3fe5..c4b51f41 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -11,7 +11,7 @@ <?= t("Admin dashboard") ?> <? endif ?> </title> - <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" /> + <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" /> <?= $theme->css("yui/reset-fonts-grids.css") ?> <?= $theme->css("themeroller/ui.base.css") ?> |