Merge branch 'v4.x' into 'aa-framework-part-2'

# Conflicts:
#   allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
#   allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
This commit is contained in:
Peter Pfeufer 2023-12-24 17:34:07 +00:00
commit 547d047f59
12 changed files with 22 additions and 22 deletions