Sync with upstream merges

This commit is contained in:
Garret Wassermann
2019-03-09 19:01:51 -05:00
29 changed files with 496 additions and 63 deletions

View File

@ -37,7 +37,6 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
'django.contrib.sites',
'django.contrib.humanize',
'markdown_deux',
'bootstrap4form',
'helpdesk'
]