diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-25 19:34:21 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-25 19:34:21 -0400 |
| commit | 1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (patch) | |
| tree | f608874663d24f19ecf175ec556f2a330d47a726 /devel/models.py | |
| parent | 747a562ddca10e29dd003e8b3c59f8f384d1bc8d (diff) | |
| parent | cd7222047b41ac3efa389a22fdd22148d03c1d61 (diff) | |
Merge tag 'release_2014-03-22' into archweb-generic
Fix long filenames; local storage for filter prefs
Conflicts:
templates/public/download.html
Diffstat (limited to 'devel/models.py')
| -rw-r--r-- | devel/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/devel/models.py b/devel/models.py index 44bbc66e..5c4d4fe7 100644 --- a/devel/models.py +++ b/devel/models.py @@ -4,7 +4,7 @@ import pytz from django.db import models from django.db.models.signals import pre_save from django.contrib.auth.models import User -from django_countries import CountryField +from django_countries.fields import CountryField from .fields import PGPKeyField from main.utils import make_choice, set_created_field |