diff options
author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-12 18:58:04 -0400 |
---|---|---|
committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-12 18:58:04 -0400 |
commit | 045fe0ee9d43aa825de6fbf14fe8fd48953d4eff (patch) | |
tree | e0743c13e20845a613ba8e4064cb1e0f10f54025 /mediagoblin/tools/pluginapi.py | |
parent | a02831687a6026b2baa0f971ecb3e594c3f415e2 (diff) | |
parent | 66cafc3b74d476710013efb46341b989028f3057 (diff) | |
download | mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.lz mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.xz mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.zip |
Merge branch 'master' into OPW-Moderation-Update
Conflicts:
mediagoblin/db/migrations.py
Diffstat (limited to 'mediagoblin/tools/pluginapi.py')
-rw-r--r-- | mediagoblin/tools/pluginapi.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py index 3f98aa8a..1eabe9f1 100644 --- a/mediagoblin/tools/pluginapi.py +++ b/mediagoblin/tools/pluginapi.py @@ -252,7 +252,7 @@ def get_hook_templates(hook_name): .. code-block:: html+jinja - {% template_hook "media_sidebar" %} + {% template_hook("media_sidebar") %} ... which will include all templates for you, partly using this method. |