diff options
| author | Tom Christie | 2013-01-07 00:52:23 -0800 |
|---|---|---|
| committer | Tom Christie | 2013-01-07 00:52:23 -0800 |
| commit | 2034009b597ac2617086734f5075732e4f71edc8 (patch) | |
| tree | a913c2bfc0935c901d8753a9ba56f0bd1049205c | |
| parent | 12bb25b372de43ac3a944a8eff518b1c6f41ddfc (diff) | |
| parent | 9b67a33b922e2797adab261640ee6f0acb093985 (diff) | |
| download | django-rest-framework-2034009b597ac2617086734f5075732e4f71edc8.tar.bz2 | |
Merge pull request #559 from michaelmior/django1.5-static
{% static %} template tag for Django 1.5
| -rw-r--r-- | rest_framework/templatetags/rest_framework.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 09c658bc..82fcdfe7 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -23,7 +23,7 @@ register = template.Library() # conflicts with this rest_framework template tag module. try: # Django 1.5+ - from django.contrib.staticfiles.templatetags import StaticFilesNode + from django.contrib.staticfiles.templatetags.staticfiles import StaticFilesNode @register.tag('static') def do_static(parser, token): |