Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'feature/exercise-crowdsourcing' into 1055-show-history
Roland Geider00a716ffc381
diff --cc requirements_dev.txtindex 60236bd97,1d554fc56..587d8dec7--- a/requirements_dev.txt+++ b/requirements_dev.txt@@@ -9,10 -9,13 +9,10 @@@wheel==0.37.1# for ingredient import script from OFF- pymongo==4.1.1+ pymongo==4.2.0-# for ingredient import script from OFF-pymongo==3.12.1-# Development packages- coverage==6.4.1+ coverage==6.4.2django-debug-toolbar==3.5.0tblib==1.7.0isort==5.10.1diff --cc yarn.lockindex 9f3b816f6,b94596941..da9c6ab01--- a/yarn.lock+++ b/yarn.lock@@@ -14,12 -14,13 +14,12 @@@Sortable@RubaXa/Sortable#1.15.0:version "1.15.0"- uid babf6ab85fdfc5e13be1027827cecfbba2fb0d1eresolved "https://codeload.github.com/RubaXa/Sortable/tar.gz/babf6ab85fdfc5e13be1027827cecfbba2fb0d1e"- version "4.6.1"- resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.1.tgz#bc25380c2c14192374e8dec07cf01b2742d222a2"- integrity sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==+ version "4.6.2"+ resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479"+ integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==commander@2:version "2.20.3"