Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (4 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214

  • django/branches/gis/django/contrib/syndication/feeds.py

    r7354 r8215  
    11from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist 
    2 from django.template import Context, loader, Template, TemplateDoesNotExist 
     2from django.template import loader, Template, TemplateDoesNotExist 
    33from django.contrib.sites.models import Site, RequestSite 
    44from django.utils import feedgenerator