diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 20:28:49 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 20:28:49 -0500 |
commit | 16e941c68ddb2d37d7e94d0c60da7e9d3dba65a0 (patch) | |
tree | 0dc941580251a06870b9ceee159b7685c8a02795 /mirrors/migrations/0009_auto__chg_field_mirrorurl_country.py | |
parent | f9ae4f860ccf57e84032d7be9426331a9e06e979 (diff) | |
parent | fbbcc8534a25d3e78ef3a319c8aeb127bc5085f0 (diff) |
Merge tag 'release_2012-04-26'parabolaweb-2012-12-12
CSS and display related tweaks
Conflicts:
public/views.py
requirements.txt
requirements_prod.txt
templates/public/download.html
Diffstat (limited to 'mirrors/migrations/0009_auto__chg_field_mirrorurl_country.py')
-rw-r--r-- | mirrors/migrations/0009_auto__chg_field_mirrorurl_country.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mirrors/migrations/0009_auto__chg_field_mirrorurl_country.py b/mirrors/migrations/0009_auto__chg_field_mirrorurl_country.py index 941ecfbb..bca6b6fb 100644 --- a/mirrors/migrations/0009_auto__chg_field_mirrorurl_country.py +++ b/mirrors/migrations/0009_auto__chg_field_mirrorurl_country.py @@ -7,11 +7,11 @@ from django.db import models class Migration(SchemaMigration): def forwards(self, orm): - db.alter_column('mirrors_mirrorurl', 'country', self.gf('mirrors.models.NullCharField')(max_length=255, null=True)) + pass def backwards(self, orm): - db.alter_column('mirrors_mirrorurl', 'country', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) + pass models = { 'mirrors.mirror': { @@ -53,7 +53,7 @@ class Migration(SchemaMigration): }, 'mirrors.mirrorurl': { 'Meta': {'object_name': 'MirrorUrl'}, - 'country': ('mirrors.models.NullCharField', [], {'db_index': 'True', 'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'null': 'True', 'blank': 'True'}), 'has_ipv4': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'has_ipv6': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |