Fix latest merge

This commit is contained in:
Nicolas Le Goff
2014-06-24 14:56:09 +02:00
parent 4b033353bf
commit 5e2dd0216a
14 changed files with 203 additions and 269 deletions

View File

@@ -19,7 +19,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta content="{{ meta_description }}" name="description"/>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<meta content="{{ meta_keywords }}" name="keywords"/>
<meta content="phraseanet" name="generator"/>
{% endblock header_meta %}