Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into feature/exercise-crowdsourcing

Roland Geidera7241d017069
diff --cc AUTHORS.rst
index 7bc6b4541,9f2fb9db5..4de30c795
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@@ -57,9 -57,9 +57,11 @@@ Developer
* Calvin Walden - https://github.com/calvinrw
* Jack Mulligan - https://github.com/jackmulligan-ire
* Kristopher Newsome - https://github.com/sysadmin75
+* Emma Muth - https://github.com/emmaamuth
+* Sophia Reed - https://github.com/sophialr
* Leninux - https://github.com/RedRudeBoy
+ * Ayush Kumar - https://github.com/gr8ayu
+ * Gorkem Arslan - https://github.com/gorkemarslan
Translators
-----------
diff --cc angular/package.json
index b3a2a14ef,359104b04..fff7d6e0e
--- a/angular/package.json
+++ b/angular/package.json
@@@ -11,19 -11,19 +11,19 @@@
},
"private": true,
"dependencies": {
- "@angular/animations": "~12.2.3",
- "@angular/cdk": "~12.2.3",
- "@angular/common": "~12.2.3",
- "@angular/compiler": "~12.2.3",
- "@angular/core": "~12.2.3",
- "@angular/forms": "~12.2.3",
- "@angular/localize": "~12.2.3",
- "@angular/platform-browser": "~12.2.3",
- "@angular/platform-browser-dynamic": "~12.2.3",
- "@angular/router": "~12.2.3",
+ "@angular/animations": "~12.2.5",
+ "@angular/cdk": "~12.2.5",
+ "@angular/common": "~12.2.5",
+ "@angular/compiler": "~12.2.5",
+ "@angular/core": "~12.2.5",
+ "@angular/forms": "~12.2.5",
+ "@angular/localize": "~12.2.5",
+ "@angular/platform-browser": "~12.2.5",
+ "@angular/platform-browser-dynamic": "~12.2.5",
+ "@angular/router": "~12.2.5",
"@ng-bootstrap/ng-bootstrap": "^10.0.0",
- "@swimlane/ngx-charts": "^18.0.1",
+ "@swimlane/ngx-charts": "^19.0.1",
- "rxjs": "~6.6.0",
+ "rxjs": "~7.3.0",
"tslib": "^2.3.1",
"zone.js": "~0.11.4"
},