Merge branch 'devel' into migration

This commit is contained in:
Akita Noek
2016-04-12 15:12:43 -04:00
6 changed files with 47 additions and 31 deletions

View File

@@ -24,11 +24,8 @@ class Label(CommonModelNameNotUnique):
organization = models.ForeignKey(
'Organization',
related_name='labels',
blank=True,
null=True,
default=None,
help_text=_('Organization this label belongs to.'),
on_delete=models.SET_NULL,
on_delete=models.CASCADE,
)
def get_absolute_url(self):