Merge upstream/main to resolve conflicts before review

Browse Source

Pulls in 8 days of upstream changes since 2026-05-19. Our one-line
addition at the markitup-mcp-server entry preserved.

# Conflicts:
#	README.md

...

This commit is contained in:

Michael

2026-05-27 19:28:03 -05:00

parent e1c3c3ef4c 70acc21948

commit fa1f35a316

2 changed files with 204 additions and 6 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

README.md

+203 -6

File diff suppressed because it is too large Load Diff