Django

Code

Show
Ignore:
Timestamp:
02/15/08 11:05:48 (11 months ago)
Author:
jkocherhans
Message:

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

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-7021 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-7120

  • django/branches/newforms-admin/django/conf/project_template/settings.py

    r6342 r7121  
    1919# Local time zone for this installation. Choices can be found here: 
    2020# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name 
    21 # although not all choices may be avilable on all operating systems. 
     21# although not all choices may be available on all operating systems. 
    2222# If running in a Windows environment this must be set to the same as your 
    2323# system time zone.