Merge branch 'develop' into feature/workoutfit

2021-03-01 09:00:04 +01:00
parent dffaacc5a3 33188f3322
commit fe9bcfd1a4
13 changed files with 30 additions and 26 deletions
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -116,6 +116,7 @@ class UserFullnameChoiceField(forms.ModelChoiceField):
    def label_from_instance(self,obj):
        return obj.get_full_name()

+
 # model for configurable template field
 class TemplateListField(models.TextField):
    def __init__(self, *args, **kwargs):