Merge branch 'master' into 'explicit>implicit'

# Conflicts: # apps/activity/views.py
2020-04-09 22:31:54 +02:00 · 2020-04-09 22:31:54 +02:00 · 99d3ba9c1a
commit 99d3ba9c1a
parent 7e0aac0125 0e082995e3
54 changed files with 2700 additions and 810 deletions
--- a/apps/activity/models.py
+++ b/apps/activity/models.py
@ -136,6 +136,8 @@ class Entry(models.Model):

    class Meta:
        unique_together = (('activity', 'note', 'guest', ), )
+        verbose_name = _("entry")
+        verbose_name_plural = _("entries")

    def save(self, *args,**kwargs):