From 89211d3072c6ab32ecde23f1dc600096b93d755e Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 29 Aug 2016 20:38:53 +0300 Subject: [PATCH] migrations merge --- common/migrations/0009_merge.py | 16 ++++++++++++++++ projects/migrations/0021_merge.py | 16 ++++++++++++++++ work_sell/migrations/0008_merge.py | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 common/migrations/0009_merge.py create mode 100644 projects/migrations/0021_merge.py create mode 100644 work_sell/migrations/0008_merge.py diff --git a/common/migrations/0009_merge.py b/common/migrations/0009_merge.py new file mode 100644 index 0000000..f079aec --- /dev/null +++ b/common/migrations/0009_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-29 17:37 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('common', '0008_auto_20160829_1923'), + ('common', '0006_settings_noreply_email'), + ] + + operations = [ + ] diff --git a/projects/migrations/0021_merge.py b/projects/migrations/0021_merge.py new file mode 100644 index 0000000..0885b46 --- /dev/null +++ b/projects/migrations/0021_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-29 17:37 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0018_auto_20160829_1837'), + ('projects', '0020_stage_term'), + ] + + operations = [ + ] diff --git a/work_sell/migrations/0008_merge.py b/work_sell/migrations/0008_merge.py new file mode 100644 index 0000000..d0ccdb8 --- /dev/null +++ b/work_sell/migrations/0008_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-29 17:37 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('work_sell', '0007_auto_20160829_1837'), + ('work_sell', '0007_auto_20160829_1740'), + ] + + operations = [ + ]