Django

Code

Show
Ignore:
Timestamp:
06/16/08 15:36:34 (7 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7668].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7603 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7668
  • django/branches/newforms-admin/django/views/defaults.py

    r5596 r7669  
    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`