Skip to content
Commit bb0538d4 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.0.X] Fixed #11270 -- Corrected naming conflict in templatetag test. Thanks... 

[1.0.X] Fixed #11270 -- Corrected naming conflict in templatetag test. Thanks to steveire for the report.

Merge of r11067 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 9356e16a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment