ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-21 01:48:21 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 'explicit>implicit'

Browse Source 
# Conflicts:
#   apps/activity/views.py
This commit is contained in:
Pierre-antoine Comby
2020-04-09 22:31:54 +02:00
parent 7e0aac0125 0e082995e3
commit 99d3ba9c1a
54 changed files with 2700 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/activity/models.py
View File

@ -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):