Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin

2011-05-03 20:04:55 +02:00
parent 65f2484654 9610848c29
commit 1b46208f3e
10 changed files with 162 additions and 41 deletions
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -0,0 +1 @@
+/* stuff goes here :) */
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -18,8 +18,8 @@
 <html>
  <head>
    <title>{% block title %}MediaGoblin{% endblock title %}</title>
-    {# <link rel="stylesheet" type="text/css"
-          href="{{ request.staticdirect('/css/base.css') }}"/> #}
+    <link rel="stylesheet" type="text/css"
+          href="{{ request.staticdirect('/css/base.css') }}"/>
  </head>

  <body>