diff --git a/partners/migrations/0027_merge_20170708_0941.py b/partners/migrations/0027_merge_20170708_0941.py new file mode 100644 index 0000000000000000000000000000000000000000..39238261ecc5cb01fbdf7fabc602408e9c2cf0a8 --- /dev/null +++ b/partners/migrations/0027_merge_20170708_0941.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2017-07-08 07:41 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('partners', '0026_auto_20170627_1809'), + ('partners', '0012_auto_20170618_2024'), + ] + + operations = [ + ] diff --git a/scipost/migrations/0060_merge_20170708_0941.py b/scipost/migrations/0060_merge_20170708_0941.py new file mode 100644 index 0000000000000000000000000000000000000000..3e51492281a5f3fe94df787ff4683e20d66e3f9a --- /dev/null +++ b/scipost/migrations/0060_merge_20170708_0941.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2017-07-08 07:41 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('scipost', '0056_auto_20170618_2024'), + ('scipost', '0059_auto_20170701_1356'), + ] + + operations = [ + ]