Merge branch 'develop' into feature/registration_bug

# Conflicts:
#	main/views.py
This commit is contained in:
Sokurov Idar
2021-04-13 22:11:31 +03:00
23 changed files with 212 additions and 80 deletions

View File

@@ -34,7 +34,7 @@
<h6 class="table-title">Список сотрудников</h6>
{% block table %}
<table class="light-table">
<table class="table table-dark light-table">
<thead>
<th>Name</th>
@@ -42,8 +42,8 @@
<th>Role</th>
<th>Checked</th>
</thead>
<tbody id="tbody">
</tbody>
<tbody id="tbody"></tbody>
</table>
<p id="loading">Данные загружаются...</p>
{% endblock %}