diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-09-27 18:00:36 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-09-27 18:00:36 +0200 |
| commit | 70cf78061853cd7ef75be15e1dfebc59161e1a56 (patch) | |
| tree | d8b21d282588c075958605d2cb1705ed21e15c3c | |
| parent | cdf69bc2a760a1c3de6044385a54ab1ef4d78c51 (diff) | |
| parent | 16d1637810f36e455c3d80e939a91ab7a43246c7 (diff) | |
| download | Chimère - projet Saclay-70cf78061853cd7ef75be15e1dfebc59161e1a56.tar.bz2 Chimère - projet Saclay-70cf78061853cd7ef75be15e1dfebc59161e1a56.zip | |
Merge branch 'ecopole' of ssh://daenerys.peacefrogs.net/var/local/git/chimere_saclay into ecopole
| -rw-r--r-- | static/saclay/images/favicon.ico | bin | 0 -> 824 bytes | |||
| -rw-r--r-- | templates/chimere/base.html | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/static/saclay/images/favicon.ico b/static/saclay/images/favicon.ico Binary files differnew file mode 100644 index 0000000..2468f94 --- /dev/null +++ b/static/saclay/images/favicon.ico diff --git a/templates/chimere/base.html b/templates/chimere/base.html index f870020..d37a653 100644 --- a/templates/chimere/base.html +++ b/templates/chimere/base.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load chimere_tags i18n %} {% block extra_head %} -<link rel="shortcut icon" href="{{ STATIC_URL }}saclay/images/favicon.png"/> +<link rel="shortcut icon" href="{{ STATIC_URL }}saclay/images/favicon.ico"/> <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/styles.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/print.css" media='print'/> <link rel="stylesheet" href="{{ STATIC_URL }}saclay/css/styles.css" /> |