Merge remote-tracking branch 'remotes/origin/master' into 9-use-permissions-rules

aleksis/apps/hjelp/admin.py

aleksis/apps/hjelp/apps.py

aleksis/apps/hjelp/menus.py

aleksis/apps/hjelp/migrations/0001_initial.py

aleksis/apps/hjelp/migrations/0002_add_bug_report.py

...lp/migrations/0003_alter_faqquestion_answer_text_field.py

aleksis/apps/hjelp/migrations/0004_add_extended_data.py

aleksis/apps/hjelp/models.py

aleksis/apps/hjelp/preferences.py

aleksis/apps/hjelp/templates/hjelp/faq.html

aleksis/apps/hjelp/urls.py

aleksis/apps/hjelp/views.py

poetry.lock