Merge master 0.2.3 bugfixes into develop

This commit is contained in:
Garret Wassermann
2017-12-09 23:02:12 -05:00
23 changed files with 3472 additions and 540 deletions

View File

@ -9,7 +9,7 @@ from django.core.exceptions import ImproperlyConfigured
try:
DEFAULT_USER_SETTINGS = settings.HELPDESK_DEFAULT_SETTINGS
except:
except AttributeError:
DEFAULT_USER_SETTINGS = None
if not isinstance(DEFAULT_USER_SETTINGS, dict):