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

Browse Source

# 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

parent b2e70c3702 5cd92e29d3

commit 547d047f59

12 changed files with 22 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files