Merge branch 'main' into tour
Merging in latest changes from main, since I got covid and missed a few weeks.
This commit is contained in:
commit
0e9dc66ffa
56 changed files with 1495 additions and 715 deletions
|
@ -2,6 +2,7 @@
|
|||
|
||||
{% block filter_fields %}
|
||||
{% include 'settings/federation/software_filter.html' %}
|
||||
{% include 'settings/users/server_filter.html' %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue