Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into master
Noah Pinter0d59f86ff76d
diff --cc AUTHORS.rstindex dda74582e,17fdf9afa..a1b50e16d--- a/AUTHORS.rst+++ b/AUTHORS.rst@@@ -32,8 -32,7 +32,9 @@@ Developer* Biplov - https://github.com/beingbiplov* Rashmi Kamath - https://github.com/Rkamath2* Anthony (Ryo) Wright - https://github.com/ryowright+ * Austin Leung - https://github.com/austin-leung+* Derek Li - https://github.com/derekli17+* Noah Pinter - https://github.com/nopinterTranslators-----------