aboutsummaryrefslogtreecommitdiffstats
path: root/api/migrations/0021_merge_20181125_1015.py
diff options
context:
space:
mode:
authorGravatar Johannes Christ <[email protected]>2018-11-25 11:16:57 +0100
committerGravatar Johannes Christ <[email protected]>2018-11-25 11:16:57 +0100
commit87a48cad5197234a6ccff616fec17a027b2adcb8 (patch)
tree0ea7bebddf9ce216e94602ddeca300184729fb00 /api/migrations/0021_merge_20181125_1015.py
parentUse proper attribute name. (diff)
parentSet up image pushing and building on Azure. (#152) (diff)
Merge branch 'django' into django+add-logs-api.
Diffstat (limited to 'api/migrations/0021_merge_20181125_1015.py')
-rw-r--r--api/migrations/0021_merge_20181125_1015.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/api/migrations/0021_merge_20181125_1015.py b/api/migrations/0021_merge_20181125_1015.py
new file mode 100644
index 00000000..d8eaa510
--- /dev/null
+++ b/api/migrations/0021_merge_20181125_1015.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.1.1 on 2018-11-25 10:15
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('api', '0020_add_snake_field_validators'),
+ ('api', '0019_deletedmessage'),
+ ]
+
+ operations = [
+ ]