Merge branch 'main' into add-edition

This commit is contained in:
Mouse Reeve
2022-03-16 16:16:55 -07:00
153 changed files with 10991 additions and 6067 deletions

View File

@ -3,10 +3,11 @@
from .admin.announcements import Announcements, Announcement
from .admin.announcements import EditAnnouncement, delete_announcement
from .admin.automod import AutoMod, automod_delete, run_automod
from .admin.automod import schedule_automod_task, unschedule_automod_task
from .admin.dashboard import Dashboard
from .admin.federation import Federation, FederatedServer
from .admin.federation import AddFederatedServer, ImportServerBlocklist
from .admin.federation import block_server, unblock_server
from .admin.federation import block_server, unblock_server, refresh_server
from .admin.email_blocklist import EmailBlocklist
from .admin.ip_blocklist import IPBlocklist
from .admin.invite import ManageInvites, Invite, InviteRequest
@ -21,6 +22,7 @@ from .admin.reports import (
moderator_delete_user,
)
from .admin.site import Site
from .admin.themes import Themes, delete_theme
from .admin.user_admin import UserAdmin, UserAdminList
# user preferences