Merge branch 'hotfix/0.10-hotfix2' into development

Conflicts:
	apps/main/__init__.py
This commit is contained in:
Roberto Rosario
2011-12-05 15:17:56 -04:00
2 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -15,7 +15,7 @@
{% compress css %}
<link rel="stylesheet" href="{{ STATIC_URL }}web_theme_media/stylesheets/base.css" type="text/css" media="screen" />
<link rel="stylesheet" id="current-theme" href="{{ STATIC_URL }}web_theme_media/stylesheets/themes/{{ web_theme }}/style.css" type="text/css" media="screen" />
<link rel="stylesheet" id="current-theme" href="{{ STATIC_URL }}web_theme_media/stylesheets/themes/{{ web_theme|default:'activo' }}/style.css" type="text/css" media="screen" />
<style type="text/css">
.message span.dismiss {
padding:0 5px;