Merge remote-tracking branch 'origin/master' into release

This commit is contained in:
Tyrel Souza 2017-01-20 15:09:24 -05:00
commit 11b34e8795
No known key found for this signature in database
GPG Key ID: 2EECB5087209E6A5

View File

@ -27,17 +27,18 @@ class Migration(migrations.Migration):
] ]
operations = [ operations = [
migrations.AlterField(
model_name='dbfile',
name='name',
field=models.CharField(max_length=100),
),
migrations.AddField( migrations.AddField(
model_name='dbfile', model_name='dbfile',
name='filehash', name='filehash',
field=models.CharField(default='filehash', max_length=32, primary_key=True, serialize=False), field=models.CharField(default='filehash', max_length=32, primary_key=True, serialize=False),
preserve_default=False, preserve_default=False,
), ),
migrations.AlterField(
model_name='dbfile',
name='name',
field=models.CharField(max_length=100),
),
migrations.RunPython(copy_filehash), migrations.RunPython(copy_filehash),
migrations.RunPython(fix_filename), migrations.RunPython(fix_filename),
] ]