aboutsummaryrefslogtreecommitdiffstats
path: root/api/migrations/0027_merge_20190120_0852.py
diff options
context:
space:
mode:
authorGravatar Johannes Christ <[email protected]>2019-01-20 09:52:57 +0100
committerGravatar Johannes Christ <[email protected]>2019-01-20 09:52:57 +0100
commitbdc337d70a386cae954399e55bb128119f601128 (patch)
treef1b90e9a2c028478e1b82325704ffdd943c4b3b6 /api/migrations/0027_merge_20190120_0852.py
parentMerge branch 'django' into django+add-logs-api. (diff)
parentAdd an example `docker-compose.yml`. (diff)
Merge branch 'django' into django+add-logs-api
Diffstat (limited to 'api/migrations/0027_merge_20190120_0852.py')
-rw-r--r--api/migrations/0027_merge_20190120_0852.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/api/migrations/0027_merge_20190120_0852.py b/api/migrations/0027_merge_20190120_0852.py
new file mode 100644
index 00000000..6fab4fd0
--- /dev/null
+++ b/api/migrations/0027_merge_20190120_0852.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.1.5 on 2019-01-20 08:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('api', '0026_use_proper_default_for_infraction_insertion_date'),
+ ('api', '0021_merge_20181125_1015'),
+ ]
+
+ operations = [
+ ]