Merge remote-tracking branch 'upstream/master'

django-helpdesk · Jun 8, 2020 · e20b236 · e20b236
2 parents a0e7753 + 2ef9da7
commit e20b236
Show file tree

Hide file tree

Showing 7 changed files with 1,339 additions and 1,373 deletions.
diff --git a/docs/install.rst b/docs/install.rst
@@ -59,7 +59,7 @@ errors with trying to create User settings.
         'django.contrib.humanize',  # Required for elapsed time formatting
         'bootstrap4form', # Required for nicer formatting of forms with the default templates
         'account',  # Required by pinax-teams
-        'pinax.inviations',  # required by pinax-teams
+        'pinax.invitations',  # required by pinax-teams
         'pinax.teams',  # team support
         'helpdesk',  # This is us!
         'reversion',  # required by pinax-teams

diff --git a/helpdesk/fixtures/emailtemplate.json b/helpdesk/fixtures/emailtemplate.json
diff --git a/helpdesk/locale/fi/LC_MESSAGES/django.mo b/helpdesk/locale/fi/LC_MESSAGES/django.mo