Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/measurements
Roland Geider95f593790a6e
diff --cc docs/changelog.rstindex 4556be0cd,4aa1b663c..72e109953--- a/docs/changelog.rst+++ b/docs/changelog.rst@@@ -15,8 -15,8 +15,9 @@@ Upgrade steps from 2.0π Features:* New gallery where users can upload pictures to track their progress `#572`_+ * Add templates / centrally managed workouts (thanks `@qwert45hi`_) `#639`_* Add comment filed to set for user notes `#702`_+* Custom measurements such as biceps size or body fat `#133`_π Bug Fixes:@@@ -35,8 -35,8 +36,9 @@@- field ``comment`` added, for user notes* `#666`_, `#656`_ (thanks `@jackmulligan-ire`_), `#716`_+.. _#133: https://github.com/wger-project/wger/issues/133.. _#572: https://github.com/wger-project/wger/issues/572+ .. _#639: https://github.com/wger-project/wger/issues/639.. _#656: https://github.com/wger-project/wger/issues/656.. _#666: https://github.com/wger-project/wger/issues/666.. _#702: https://github.com/wger-project/wger/issues/702