aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/head.tpl
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2012-12-18 16:59:08 +0000
committerThomas Willingham <founder@kakste.com>2012-12-18 16:59:08 +0000
commitd9194fdb5a6709eba8f47795dd5367d79ad0e367 (patch)
tree86a91ec7a556310400c2eb26d45bbeb108486b36 /view/tpl/head.tpl
parent2cb2896916ce98f16b891634fddcbd403c55d95f (diff)
parente9b5b0f0b424930b87708080c4e6ce671016177b (diff)
downloadvolse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.tar.gz
volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.tar.bz2
volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: view/theme/redbasic/css/style.css
Diffstat (limited to 'view/tpl/head.tpl')
-rw-r--r--view/tpl/head.tpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 9c0e6b09a..632ab21ca 100644
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -12,7 +12,7 @@ $js_strings
$head_js
-<link rel="shortcut icon" href="$baseurl/images/fred-32.png" />
+<link rel="shortcut icon" href="$baseurl/images/red.png" />
<link rel="search"
href="$baseurl/opensearch"
type="application/opensearchdescription+xml"