Merge branch 'develop' into feature/spaces

# Conflicts:
#	cookbook/views/data.py
#	cookbook/views/views.py
This commit is contained in:
vabene1111
2021-02-25 15:59:32 +01:00
19 changed files with 2353 additions and 962 deletions

View File

@@ -1,10 +1,10 @@
bleach==3.3.0
bleach-whitelist==0.0.11
Django==3.1.6
Django==3.1.7
django-annoying==0.10.6
django-autocomplete-light==3.8.1
django-autocomplete-light==3.8.2
django-cleanup==5.1.0
django-crispy-forms==1.11.0
django-crispy-forms==1.11.1
django-emoji-picker==0.0.6
django-filter==2.4.0
django-tables2==2.3.4
@@ -12,7 +12,7 @@ djangorestframework==3.12.2
drf-writable-nested==0.6.2
gunicorn==20.0.4
lxml==4.6.2
Markdown==3.3.3
Markdown==3.3.4
Pillow==8.1.0
psycopg2-binary==2.8.6
python-dotenv==0.15.0