Django

Code

Show
Ignore:
Timestamp:
06/26/08 10:11:55 (7 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7643-7662,7667-7668,7672-7682,7686-7693,7695-7698,7700-7702,7704-7706,7710,7712-7729,7731-7732,7738-7758,7760-7766 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7641 to /django/trunk:1-7767

  • django/branches/gis/django/views/defaults.py

    r6018 r7768  
    6969def page_not_found(request, template_name='404.html'): 
    7070    """ 
    71     Default 404 handler, which looks for the requested URL in the redirects 
    72     table, redirects if found, and displays 404 page if not redirected. 
     71    Default 404 handler. 
    7372 
    7473    Templates: `404.html`