Merge branch 'master' into 'jbpasquier/template-mail'
# Conflicts: # djangoldp_notification/models.py
This commit is contained in:
		@ -29,7 +29,7 @@ class Notification(Model):
 | 
			
		||||
    unread = models.BooleanField(default=True)
 | 
			
		||||
 | 
			
		||||
    class Meta(Model.Meta):
 | 
			
		||||
        permission_classes = [InboxPermissions]
 | 
			
		||||
        #permission_classes = [InboxPermissions]
 | 
			
		||||
        ordering = ['date']
 | 
			
		||||
 | 
			
		||||
    def __str__(self):
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user