Merge branch 'develop' into feature/meal-planning

# Conflicts:
#	requirements.txt
This commit is contained in:
vabene1111
2020-06-04 13:12:52 +02:00
21 changed files with 1429 additions and 38 deletions

View File

@@ -1,23 +1,23 @@
django
Pillow
django-tables2
django-filter
django-crispy-forms
djangorestframework
django-cors-headers
django-autocomplete-light
django-emoji-picker
django-cleanup
django-annoying
bleach
bleach-whitelist
six
requests
markdown
simplejson
lxml
webdavclient3
python-dotenv
psycopg2-binary
whitenoise
gunicorn
django-cors-headers==3.3.0
bleach==3.1.5
bleach-whitelist==0.0.10
Django==3.0.7
django-annoying==0.10.6
django-autocomplete-light==3.5.1
django-cleanup==4.0.0
django-crispy-forms==1.9.1
django-emoji-picker==0.0.6
django-filter==2.2.0
django-tables2==2.3.1
djangorestframework==3.11.0
gunicorn==20.0.4
lxml==4.5.1
Markdown==3.2.2
Pillow==7.1.2
psycopg2-binary==2.8.5
python-dotenv==0.13.0
requests==2.23.0
simplejson==3.17.0
six==1.15.0
webdavclient3==3.14.4
whitenoise==5.1.0