Skip to content

Commit 4547d05

Browse files
hyperpolymathclaude
andcommitted
Merge origin/main into fix/glama-license-tables-proof (resolve conflicts)
- README.md: kept the pre-existing MPL-2.0 header + the branch title; dropped main's standardization-sweep duplicate (a second // CC-BY-SA-4.0 header that collided with the file's existing MPL-2.0 header and the PR's MPL-2.0 intent). - site/index.md: honoured main's deletion (#233 replaced it with the new site/index.html website). Branch's only change there was a cartridge-count bump, carried as a flag (see PR comment) rather than into the deleted file. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2 parents 14a43ee + 6d876b4 commit 4547d05

693 files changed

Lines changed: 4769 additions & 2660 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.claude/CLAUDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
SPDX-License-Identifier: MPL-2.0
2+
SPDX-License-Identifier: CC-BY-SA-4.0
33
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
44
-->
55
# CLAUDE.md - AI Assistant Instructions

.claude/PROJECT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
SPDX-License-Identifier: MPL-2.0
2+
SPDX-License-Identifier: CC-BY-SA-4.0
33
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
44
-->
55
# BOJ Server - Claude Code Instructions

.devcontainer/README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: MPL-2.0
1+
// SPDX-License-Identifier: CC-BY-SA-4.0
22
// Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
33
= Dev Container Usage
44
:author: Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>

.github/CICD-CHANGES-2026-06-04.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
SPDX-License-Identifier: MPL-2.0
2+
SPDX-License-Identifier: CC-BY-SA-4.0
33
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
44
-->
55

.github/CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
SPDX-License-Identifier: MPL-2.0
2+
SPDX-License-Identifier: CC-BY-SA-4.0
33
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
44
-->
55
# Code of Conduct

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
SPDX-License-Identifier: MPL-2.0
2+
SPDX-License-Identifier: CC-BY-SA-4.0
33
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
44
-->
55
# Contributing to boj-server

.github/DISCUSSION_TEMPLATE/cartridge-proposal.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.

.github/DISCUSSION_TEMPLATE/hosting.yml

Lines changed: 0 additions & 60 deletions
This file was deleted.

.github/DISCUSSION_TEMPLATE/ideas.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/DISCUSSION_TEMPLATE/q-and-a.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)