diff --git a/partners/migrations/0030_merge_20170730_0935.py b/partners/migrations/0030_merge_20170730_0935.py new file mode 100644 index 0000000000000000000000000000000000000000..547d6f7eea65604c4114c40b7f9dd7349d9a4b68 --- /dev/null +++ b/partners/migrations/0030_merge_20170730_0935.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2017-07-30 07:35 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('partners', '0028_merge_20170721_1419'), + ('partners', '0029_merge_20170726_0945'), + ] + + operations = [ + ] diff --git a/scipost/migrations/0061_merge_20170730_0935.py b/scipost/migrations/0061_merge_20170730_0935.py new file mode 100644 index 0000000000000000000000000000000000000000..2869252d98ca3ac9991106222b74948825845473 --- /dev/null +++ b/scipost/migrations/0061_merge_20170730_0935.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2017-07-30 07:35 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('scipost', '0060_auto_20170726_1612'), + ('scipost', '0060_merge_20170708_0941'), + ] + + operations = [ + ]