Merge branch 'master' into training

# Conflicts:
#	RIGS/templates/risk_assessment_form.html
#	templates/base.html
This commit is contained in:
2021-10-08 18:40:39 +01:00
36 changed files with 592 additions and 437 deletions

View File

@@ -1,4 +1,4 @@
<li class="nav-item dropdown" id="user">
<li class="nav-item dropdown align-self-end" id="user">
{% if user.is_authenticated %}
<a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Hi {{ user.first_name }}