1
0
Fork 0

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:
Hugh Rundle 2022-07-03 16:18:50 +10:00
commit 0e9dc66ffa
56 changed files with 1495 additions and 715 deletions

View file

@ -2,6 +2,7 @@
{% block filter_fields %}
{% include 'settings/federation/software_filter.html' %}
{% include 'settings/users/server_filter.html' %}
{% endblock %}