Merge branch 'master' into aureplop/kfet-auth

This commit is contained in:
Aurélien Delobelle 2017-10-24 19:31:36 +02:00
commit 09290131d5
2 changed files with 2 additions and 3 deletions

View file

@ -1,13 +1,12 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('kfet', '0057_add_perms_config'),
('kfet', '0056_change_account_meta'),
('kfet', '0054_update_promos'),
]

View file

@ -7,7 +7,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('kfet', '0056_change_account_meta'),
('kfet', '0060_amend_supplier'),
]
operations = [