Merge branch 'master' into 'ago'

Browse Source

# Conflicts:
#   templates/scripts/intro_mail.html
#   templates/scripts/intro_mail.txt

...

This commit is contained in:

quark 2025-02-23 17:57:09 +01:00

parent 4140966265 d1ebf893a7

commit 6ef808bdd1

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

Diff Content Not Available