Merge brunotikami/master for user and email threading, for #385 and #375

This commit is contained in:
Garret Wassermann
2018-12-28 10:53:28 -05:00
9 changed files with 1163 additions and 158 deletions

View File

@ -12,7 +12,7 @@ import os
from django.conf import settings
from django.db.models import Q
from django.utils.encoding import smart_text
from django.utils.encoding import smart_text, smart_str
from django.utils.safestring import mark_safe
from helpdesk.models import Attachment, EmailTemplate