Merge origin/master into master, resolving .gitignore conflict
authorShane Jaroch <chown_tee@proton.me>
Tue, 20 Jan 2026 21:41:53 +0000 (16:41 -0500)
committerShane Jaroch <chown_tee@proton.me>
Tue, 20 Jan 2026 21:41:53 +0000 (16:41 -0500)

Trivial merge