Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into split-exercise-translations
nikithamurikinati314ebdae2a6a
diff --cc AUTHORS.rstindex 95ea9a01d,a1b50e16d..9a35ff914--- a/AUTHORS.rst+++ b/AUTHORS.rst@@@ -32,12 -32,10 +32,16 @@@ Developer* Biplov - https://github.com/beingbiplov* Rashmi Kamath - https://github.com/Rkamath2* Anthony (Ryo) Wright - https://github.com/ryowright+* Nikitha Murikinati - https://github.com/nikithamurikinati+* Harlene Samra - https://github.com/harlenesamra+* Justine Cho - https://github.com/jcho17+* Vaheeshta Mehrshahi - https://github.com/vaheeshta+* Jeevika Ghosh - https://github.com/jeevikaghosh+ * Austin Leung - https://github.com/austin-leung+ * Derek Li - https://github.com/derekli17+ * Noah Pinter - https://github.com/nopinter++Translators-----------