Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' of github.com:rolandgeider/wger
Roland Geider28adf02825ba
diff --cc wger/software/templates/changelog.htmlindex 0c5f98443,d427510b0..fd86f446c--- a/wger/software/templates/changelog.html+++ b/wger/software/templates/changelog.html@@@ -20,6 -23,18 +23,21 @@@<a href="https://github.com/rolandgeider/wger/issues/102">#102</a></li><li>++<<<<<<< HEAD++=======+ Email reminder to regularly enter (body) weight entries+ <a href="https://github.com/rolandgeider/wger/issues/115">#115</a>+ </li>+ <li>+ Add day detail view in workout calendar+ <a href="https://github.com/rolandgeider/wger/issues/103">#103</a>+ </li>+ <li>+ Fix bug where the exercises added to a superset did not remain sorted+ <a href="https://github.com/rolandgeider/wger/issues/89">#89</a>+ </li>+ <li>++>>>>>>> 223e7bcdf0b40839fa796508859b13808b9cbb7bReduce size of generated html code<a href="https://github.com/rolandgeider/wger/issues/125">#125</a></li>