Merge pull request #60 from lgoldbach/dev

Dev
maxplanck-ie · Mar 11, 2020 · d30a2e0 · d30a2e0
2 parents 6cab7a0 + ca2a46e
commit d30a2e0
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 202 deletions.
diff --git a/library_sample_shared/migrations/0012_auto_20200310_1107.py b/library_sample_shared/migrations/0012_auto_20200310_1107.py
diff --git a/library_sample_shared/migrations/0013_auto_20200310_1108.py b/library_sample_shared/migrations/0013_auto_20200310_1108.py
diff --git a/library_sample_shared/migrations/0014_auto_20200310_1114.py b/library_sample_shared/migrations/0014_auto_20200310_1114.py
diff --git a/library_sample_shared/migrations/0015_auto_20200310_1116.py b/library_sample_shared/migrations/0015_auto_20200310_1116.py
diff --git a/library_sample_shared/migrations/0017_auto_20200310_1444.py b/library_sample_shared/migrations/0017_auto_20200310_1444.py
diff --git a/library_sample_shared/migrations/0018_auto_20200310_1449.py b/library_sample_shared/migrations/0018_auto_20200310_1449.py
diff --git a/library_sample_shared/migrations/0019_auto_20200310_1520.py b/library_sample_shared/migrations/0019_auto_20200310_1520.py
diff --git a/library_sample_shared/migrations/0020_auto_20200310_1535.py b/library_sample_shared/migrations/0020_auto_20200310_1535.py
diff --git a/...red/migrations/0016_auto_20200310_1141.py → ...red/migrations/0023_auto_20200311_1022.py b/...red/migrations/0016_auto_20200310_1141.py → ...red/migrations/0023_auto_20200311_1022.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.28 on 2020-03-10 10:41
+# Generated by Django 1.11.28 on 2020-03-11 09:22
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('library_sample_shared', '0015_auto_20200310_1116'),
+        ('library_sample_shared', '0022_auto_20200311_1014'),
     ]
 
     operations = [