Merge branch 'develop' into feature/unit-conversion

# Conflicts:
#	requirements.txt
This commit is contained in:
vabene1111
2023-04-30 21:51:56 +02:00
72 changed files with 5733 additions and 3812 deletions

View File

@@ -29,12 +29,12 @@ microdata==0.8.0
Jinja2==3.1.2
django-webpack-loader==1.8.1
git+https://github.com/BITSOLVER/django-js-reverse@071e304fd600107bc64bbde6f2491f1fe049ec82
django-allauth==0.52.0
recipe-scrapers==14.35.0
django-allauth==0.54.0
recipe-scrapers==14.36.1
django-scopes==1.2.0.post1
pytest==7.2.2
pytest==7.3.1
pytest-django==4.5.2
django-treebeard==4.5.1
django-treebeard==4.7
django-cors-headers==3.13.0
django-storages==1.13.2
boto3==1.26.41
@@ -42,8 +42,8 @@ django-prometheus==2.2.0
django-hCaptcha==0.2.0
python-ldap==3.4.3
django-auth-ldap==4.2.0
pytest-factoryboy==2.5.0
pytest-factoryboy==2.5.1
pyppeteer==1.0.2
validators==0.20.0
pytube==12.1.0
pint==0.20.1
pint==0.20.1