diff --git a/partners/migrations/0018_merge_20170624_1943.py b/partners/migrations/0018_merge_20170624_1943.py new file mode 100644 index 0000000000000000000000000000000000000000..04770cb31326110a1c70c27ab6c06a133c9ece45 --- /dev/null +++ b/partners/migrations/0018_merge_20170624_1943.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2017-06-24 17:43 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('partners', '0017_auto_20170624_1358'), + ('partners', '0013_auto_20170623_0806'), + ] + + operations = [ + ] diff --git a/scipost/migrations/0057_merge_20170624_1943.py b/scipost/migrations/0057_merge_20170624_1943.py new file mode 100644 index 0000000000000000000000000000000000000000..bb2fb8d667353d8c91605f69c4d072e5cbd8060a --- /dev/null +++ b/scipost/migrations/0057_merge_20170624_1943.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2017-06-24 17:43 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('scipost', '0056_auto_20170623_0806'), + ('scipost', '0056_auto_20170619_2049'), + ] + + operations = [ + ]