Merge remote-tracking branch 'ahmed/master' into ahmed_merge

Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
This commit is contained in:
Nico Schottelius 2020-02-25 18:19:55 +01:00
commit e790063d5a
12 changed files with 128 additions and 71 deletions

View file

@ -1,4 +1,4 @@
# Generated by Django 3.0.3 on 2020-02-23 17:09
# Generated by Django 3.0.3 on 2020-02-23 17:12
from django.conf import settings
from django.db import migrations, models