Self hosted FLOSS fitness/workout, nutrition and weight tracker
solved merge conflict at authors.rst
Svn-Spc5bdd1dae9f2
diff --git a/AUTHORS.rst b/AUTHORS.rstindex 6385ad846..234bbc14a 100644--- a/AUTHORS.rst+++ b/AUTHORS.rst@@ -25,7 +25,10 @@ Developers* Malcolm Jones: https://github.com/DevloperMal* Boniface Mwenda: https://github.com/andela-bmwenda* Scott Peshak: https://github.com/speshak+* Musanje Louis Michael: https://github.com/louiCoder+* Kevin Antonio Rateni Iatauro: https://github.com/WalkingPizza* Sven - https://github.com/Svn-Sp+Translators-----------