diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:43:56 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:43:56 -0400 |
| commit | 355087ebe2e3fbd5f860e4655888a89d9df52e34 (patch) | |
| tree | d01f6206a2f2d054d4d1931019f5ba2a248fe982 /packages/models.py | |
| parent | ae785343076fd1fe8b89f69ca370f7fcd0cdcbd4 (diff) | |
| parent | ea00a099dffd7157c93af54b5817734348d2bbc6 (diff) | |
Merge branch 'archweb-generic' into master-nomake
Conflicts:
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
urls.py
Diffstat (limited to 'packages/models.py')
| -rw-r--r-- | packages/models.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/models.py b/packages/models.py index da8adc56..dd69e7d3 100644 --- a/packages/models.py +++ b/packages/models.py @@ -181,9 +181,7 @@ class FlagRequest(models.Model): user = models.ForeignKey(User, blank=True, null=True) user_email = models.EmailField('email address') created = models.DateTimeField(editable=False, db_index=True) - # Great work, Django... https://code.djangoproject.com/ticket/18212 - ip_address = models.GenericIPAddressField(verbose_name='IP address', - unpack_ipv4=True) + ip_address = models.GenericIPAddressField('IP address', unpack_ipv4=True) pkgbase = models.CharField(max_length=255, db_index=True) pkgver = models.CharField(max_length=255) pkgrel = models.CharField(max_length=255) |