Merge upstream/main into feat/untappd-icon-v2

Resolve conflicts in icon sample pages by adopting upstream's {{< icon-ref >}}
shortcode, which dynamically generates the icon table.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Alex HaslamandClaude Sonnet 4.6 committed 2026-04-12 21:27:37 +01:00
commit b9883c761d
858 files changed
+4628 -3410

No files matched your search

+1
View File
@@ -74,4 +74,5 @@ title = "Blowfish"
# { youtube = "https://youtube.com/username" },
# { ko-fi = "https://ko-fi.com/username" },
# { codeberg = "https://codeberg.org/username"},
# { printables = "https://www.printables.com/@username"},
# ]