Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into harlenesamra-open-food-facts
Roland Geiderf62c1bdb4d19
diff --cc AUTHORS.rstindex 5c5d5e485,092415207..8cfaff56a--- a/AUTHORS.rst+++ b/AUTHORS.rst@@@ -33,9 -33,12 +33,15 @@@ Developer* Rashmi Kamath - https://github.com/Rkamath2* Anthony (Ryo) Wright - https://github.com/ryowright* Austin Leung - https://github.com/austin-leung+* Harlene Samra - https://github.com/harlenesamra+* Nikitha Murikinati - https://github.com/nikithamurikinati+* Justine Cho - https://github.com/jcho1+ * Lydia Xing - https://github.com/lydiaxing+ * Ellie Qiu - https://github.com/eq8913+ * Hita Kambhamettu - https://github.com/Hita-K+ * Derek Li - https://github.com/derekli17+ * Noah Pinter - https://github.com/nopinter+ * Kevin Geng - https://github.com/gengkevTranslators-----------