diff --git a/sapl/materia/migrations/0037_merge_20190111_1727.py b/sapl/materia/migrations/0037_merge_20190111_1727.py new file mode 100644 index 000000000..b7e199ce8 --- /dev/null +++ b/sapl/materia/migrations/0037_merge_20190111_1727.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.18 on 2019-01-11 19:27 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0034_auto_20190103_1446'), + ('materia', '0036_auto_20190106_0330'), + ] + + operations = [ + ] diff --git a/sapl/norma/migrations/0021_merge_20190111_1728.py b/sapl/norma/migrations/0021_merge_20190111_1728.py new file mode 100644 index 000000000..c8799e001 --- /dev/null +++ b/sapl/norma/migrations/0021_merge_20190111_1728.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.18 on 2019-01-11 19:28 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('norma', '0018_auto_20190103_1446'), + ('norma', '0020_auto_20190106_0454'), + ] + + operations = [ + ] diff --git a/sapl/protocoloadm/migrations/0017_merge_20190111_1728.py b/sapl/protocoloadm/migrations/0017_merge_20190111_1728.py new file mode 100644 index 000000000..1865db3ad --- /dev/null +++ b/sapl/protocoloadm/migrations/0017_merge_20190111_1728.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.18 on 2019-01-11 19:28 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('protocoloadm', '0016_auto_20190110_1345'), + ('protocoloadm', '0011_auto_20190103_1446'), + ] + + operations = [ + ]