Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/scss
Roland Geidere63183aed341
diff --cc yarn.lockindex a4908b102,599940af9..27e941a8e--- a/yarn.lock+++ b/yarn.lock@@@ -2,19 -2,19 +2,25 @@@# yarn lockfile v1- Sortable@RubaXa/Sortable#1.4.x:- version "1.4.2"- resolved "https://codeload.github.com/RubaXa/Sortable/tar.gz/51337f72792525e438680695e223b327b1648e0a"+ "@types/jquery@^2.0.32":+ version "2.0.54"+ resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-2.0.54.tgz#d7999245f77c3fab5d84e7d32b8a6c20bfd1f072"+ integrity sha512-D/PomKwNkDfSKD13DEVQT/pq2TUjN54c6uB341fEZanIzkjfGe7UaFuuaLZbpEiS5j7Wk2MUHAZqZIoECw29lg==++ Sortable@RubaXa/Sortable#1.10.2:+ version "1.10.2"+ uid "2addddd67387b6e4b6b5e51806eb698f0a3eee88"+ resolved "https://codeload.github.com/RubaXa/Sortable/tar.gz/2addddd67387b6e4b6b5e51806eb698f0a3eee88"-bootstrap@twbs/bootstrap#4.x:version "4.5.0"- resolved "https://codeload.github.com/twbs/bootstrap/tar.gz/7a6da5e3e7ad7c749dde806546a35d4d4259d965"+ resolved "https://registry.yarnpkg.com/bootstrap-scss/-/bootstrap-scss-4.5.0.tgz#c1e48d4050dec7885cc9acfc61d3df7827a134ca"+ integrity sha512-6vCW3JBfOW7v9EQwyV0kWdEyvk2hf7U8TIojRgz19/nJoJGe8BQa1L/Tk7B0wmKEqHR/lA93Lhp+dLRphZt3vg==++bootstrap@bootstrap-scss#4.x:+ version "4.5.2"+ resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.2.tgz#a85c4eda59155f0d71186b6e6ad9b875813779ab"+ integrity sha512-vlGn0bcySYl/iV+BGA544JkkZP5LB3jsmkeKLFQakCOwCM3AOk7VkldBz4jrzSe+Z0Ezn99NVXa1o45cQY4R6A==commander@2:version "2.20.3"