From a08cd1a583cdda6a1175b9e1e4c9c184f3112c5d Mon Sep 17 00:00:00 2001 From: nikrou Date: Thu, 22 Jun 2006 19:21:56 +0000 Subject: svn merge -r1366:1371 from branch 1.6 into trunk git-svn-id: http://piwigo.org/svn/trunk@1377 68402e56-0260-453c-a942-63ccdbb3a9ee --- template/yoga/theme/clear/themeconf.inc.php | 3 ++- template/yoga/theme/dark/themeconf.inc.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'template/yoga/theme') diff --git a/template/yoga/theme/clear/themeconf.inc.php b/template/yoga/theme/clear/themeconf.inc.php index 10b5d104b..369818a1c 100644 --- a/template/yoga/theme/clear/themeconf.inc.php +++ b/template/yoga/theme/clear/themeconf.inc.php @@ -4,6 +4,7 @@ $themeconf = array( 'theme' => 'clear', 'icon_dir' => 'template/yoga/icon', 'admin_icon_dir' => 'template/yoga/icon/admin', - 'mime_icon_dir' => 'template/yoga/icon/mimetypes/' + 'mime_icon_dir' => 'template/yoga/icon/mimetypes/', + 'local_head' => '' ); ?> diff --git a/template/yoga/theme/dark/themeconf.inc.php b/template/yoga/theme/dark/themeconf.inc.php index 9785a2916..1051e5f3e 100644 --- a/template/yoga/theme/dark/themeconf.inc.php +++ b/template/yoga/theme/dark/themeconf.inc.php @@ -4,6 +4,7 @@ $themeconf = array( 'theme' => 'dark', 'icon_dir' => 'template/yoga/icon', 'admin_icon_dir' => 'template/yoga/icon/admin', - 'mime_icon_dir' => 'template/yoga/icon/mimetypes/' + 'mime_icon_dir' => 'template/yoga/icon/mimetypes/', + 'local_head' => '' ); ?> -- cgit v1.2.3