Merge branch 'feature/rename-dashboard' into develop

Fantomas42 · Jun 21, 2014 · c8e7d14 · c8e7d14
2 parents 39bc73a + 0bd8c96
commit c8e7d14
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/...ia/static/zinnia/css/dashboard_zinnia.css → zinnia/static/zinnia/css/admin.dashboard.css b/...ia/static/zinnia/css/dashboard_zinnia.css → zinnia/static/zinnia/css/admin.dashboard.css
diff --git a/.../static/zinnia/sass/dashboard_zinnia.scss → ...a/static/zinnia/sass/admin.dashboard.scss b/.../static/zinnia/sass/dashboard_zinnia.scss → ...a/static/zinnia/sass/admin.dashboard.scss
diff --git a/zinnia/templates/admin/zinnia/app_index.html b/zinnia/templates/admin/zinnia/app_index.html
@@ -4,7 +4,7 @@
 {% block extrastyle %}
 {{ block.super }}
 <link rel="stylesheet" type="text/css" href="{% static "zinnia/css/jquery.autocomplete.css" %}" />
-<link rel="stylesheet" type="text/css" href="{% static "zinnia/css/dashboard_zinnia.css" %}" />
+<link rel="stylesheet" type="text/css" href="{% static "zinnia/css/admin.dashboard.css" %}" />
 {% endblock extrastyle %}
 
 {% block extrahead %}