Merge remote branch 'philwo/master'

This commit is contained in:
Jannis Leidel
2011-01-15 01:21:39 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1 +1 @@
<link rel="stylesheet" href="{{ url }}" type="text/css" {% if media %}media="{{ media }}" {% endif %}charset="utf-8" />
<link rel="stylesheet" href="{{ url }}" type="text/css"{% if media %} media="{{ media }}"{% endif %}>

View File

@@ -1 +1 @@
<style type="text/css"{% if media %} media="{{ media }}"{% endif %}>{{ content|safe }}</style>
<style type="text/css"{% if media %} media="{{ media }}"{% endif %}>{{ content|safe }}</style>