Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/exercise-crowdsourcing
Roland Geiderb195adec97bd
diff --cc requirements.txtindex 5d32937c4,12f720737..48dd7750a--- a/requirements.txt+++ b/requirements.txt@@@ -15,14 -12,13 +15,14 @@@ django-email-verification~=0.1.django_compressor~=4.0django_extensions~=3.1django-storages~=1.12- django-environ==0.8.1+ django-environ==0.9.0easy-thumbnails==2.8.1+fontawesomefree~=6.1.1icalendar==4.0.9- invoke~=1.7- pillow~=9.1- reportlab==3.6.9- requests==2.27.1+ invoke==1.7.1+ pillow==9.1.1+ reportlab==3.6.10+ requests==2.28.0# AWSdiff --cc requirements_dev.txtindex 8721a1cbd,053c2c332..53274189b--- a/requirements_dev.txt+++ b/requirements_dev.txt@@@ -11,11 -11,8 +11,11 @@@ wheel==0.37.# for ingredient import script from OFFpymongo==4.1.1+# for ingredient import script from OFF+pymongo==3.12.1+# Development packages- coverage==6.3.3+ coverage==6.4.1django-debug-toolbar==3.4.0tblib==1.7.0isort==5.10.1