aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/plugins/metadata_display
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2014-05-13 15:24:59 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2014-05-13 15:24:59 -0400
commit1d09e8b4f1be938a3415329f4fd93e4f6936b16a (patch)
treeb14feac978e2bbd2eb9f79a81ce220cf51356f76 /mediagoblin/plugins/metadata_display
parentb5dd2459893fd1e7ae1376a7573a36bf15c983f7 (diff)
parentcc7c9091acf4103d5a0e9a910eeb07bfb01b2916 (diff)
downloadmediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.tar.lz
mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.tar.xz
mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.zip
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadata
Conflicts: mediagoblin/gmg_commands/__init__.py
Diffstat (limited to 'mediagoblin/plugins/metadata_display')
-rw-r--r--mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/bits/metadata_extra_head.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/bits/metadata_extra_head.html b/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/bits/metadata_extra_head.html
index 84eedf18..4a380299 100644
--- a/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/bits/metadata_extra_head.html
+++ b/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/bits/metadata_extra_head.html
@@ -1,3 +1,3 @@
<link rel="stylesheet" type="text/css"
- href="{{ request.staticdirect('css/metadata_display.css',
+ href="{{ request.staticdirect('css/metadata_display.css',
'metadata_display') }}"/>