From f2dc7380c291c72035fbb5955a3268d6d3e667dd Mon Sep 17 00:00:00 2001 From: James Newlands Date: Tue, 17 Apr 2018 23:07:55 +1000 Subject: [PATCH] Merge in some migrations from master --- .../build/migrations/0008_merge_20180417_2307.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 InvenTree/build/migrations/0008_merge_20180417_2307.py diff --git a/InvenTree/build/migrations/0008_merge_20180417_2307.py b/InvenTree/build/migrations/0008_merge_20180417_2307.py new file mode 100644 index 0000000000..70b385da04 --- /dev/null +++ b/InvenTree/build/migrations/0008_merge_20180417_2307.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2018-04-17 13:07 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('build', '0004_auto_20180417_2127'), + ('build', '0007_auto_20180417_1025'), + ] + + operations = [ + ]