Merge remote-tracking branch 'origin/main'

Browse Source

# Conflicts:
#	templates/book_detail.templ
#	templates/collection_rules.templ
#	templates/conflicts.templ
#	templates/header.templ
#	templates/progress.templ

...

This commit is contained in:

john-okeefe

2026-08-08 15:43:16 -04:00

parent 4b152bbe4e 2976dad4e5

commit 89ea310414

143 changed files with 14628 additions and 6016 deletions

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

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

templates/conflicts_templ.go

+102 -28

File diff suppressed because one or more lines are too long