Django

Code

Show
Ignore:
Timestamp:
07/04/08 15:16:22 (6 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7772-7808,7811-7814,7816-7823,7826-7829,7831-7833,7835 via svnmerge from trunk. Modified GeoWhereNode accordingly for changes in r7835.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

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

  • django/branches/gis/django/contrib/flatpages/models.py

    r7768 r7836  
    99        help_text=_("Example: '/about/contact/'. Make sure to have leading and trailing slashes.")) 
    1010    title = models.CharField(_('title'), max_length=200) 
    11     content = models.TextField(_('content')) 
     11    content = models.TextField(_('content'), blank=True) 
    1212    enable_comments = models.BooleanField(_('enable comments')) 
    1313    template_name = models.CharField(_('template name'), max_length=70, blank=True,