Commit 377e478
Merge origin/main into fix/glama-license-tables-proof; resolve README conflict
main converged on a Markdown-only README (deleted README.adoc, rewrote
README.md — the Glama-crawler-driven clean-Markdown direction); the PR branch
had independently kept README.adoc and rewritten README.md.
Resolution:
- README.adoc: accept main's deletion (Markdown-only is the intended end state).
- README.md: take main's newer/fuller rewrite as the canonical body, with two fixes:
* malformed licence badge URL `MPL_2.0--3.0--or--later` -> `MPL_2.0`
(no such licence; `-or-later` is estate-banned).
* header SPDX CC-BY-SA-4.0 -> MPL-2.0 (owner decision) to satisfy this repo's
pre-commit hook (still strict MPL-2.0) and match the PR's "MPL-2.0 licensing"
purpose. NB: the estate docs=CC-BY-SA split is not yet rolled into boj's hook.
OPEN (pending owner notes): main's README.md says "115 cartridges" / no 0.4.7,
vs the PR's reconciled 125 / 68 / 0.4.7. Left as main's values — owner to settle.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>5 files changed
Lines changed: 738 additions & 756 deletions
File tree
- .github/workflows
- .well-known
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | | - | |
0 commit comments