Merge branch 'develop' into hotfix/role_view

# Conflicts:
#	main/views.py
This commit is contained in:
Timofey Mazurov
2021-03-30 00:39:28 +03:00
25 changed files with 621 additions and 154 deletions

View File

@@ -106,12 +106,13 @@
<button type="submit" name="light_agent" class="hand-over-acess-button default-button">
Назначить выбранных на роль легкого агента
</button>
</div>
</div>
{% endblock %}
</form>
{% endblock %}
{% include 'base/success_messages.html' %}
</div>
<script src="{% static 'main/js/control.js'%}" type="text/babel"></script>