diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-13 15:24:59 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-13 15:24:59 -0400 |
| commit | 1d09e8b4f1be938a3415329f4fd93e4f6936b16a (patch) | |
| tree | b14feac978e2bbd2eb9f79a81ce220cf51356f76 /mediagoblin/templates | |
| parent | b5dd2459893fd1e7ae1376a7573a36bf15c983f7 (diff) | |
| parent | cc7c9091acf4103d5a0e9a910eeb07bfb01b2916 (diff) | |
| download | mediagoblin-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/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index b4c7eb8b..28b9c63c 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -165,6 +165,7 @@ <a href="{{ request.urlgen('mediagoblin.moderation.reports') }}"> {%- trans %}Report management panel{% endtrans -%} </a> + {% template_hook("moderation_powers") %} </p> {% endif %} {% include 'mediagoblin/fragments/header_notifications.html' %} |