Merge to develop to clear #870 conflict - #888

Merged

johnbeve merged 9 commits into

develop_to_master_conflicts

Jun 21, 2026

Commits on Nov 4, 2024

Merge pull request #536 from CommonCoreOntology/develop
Mark Jensen
authored
7db5d0b
Merge pull request #538 from CommonCoreOntology/develop
Mark Jensen
authored
fb55cba

Commits on Nov 8, 2024

Merge branch 'develop'
JENSEN
committed
bb19a22
Merge branch 'develop'
Mark Jensen
committed
8e9e553

Commits on Apr 4, 2026

2.1 Release PR (#851)
johnbeve
authored
5d506a5
Revert "2.1 Release PR (#851)"
johnbeve
committed
b11e972
Merge remote-tracking branch 'origin/develop'
johnbeve
committed
c0faab5

Commits on Apr 5, 2026

update release version
johnbeve
committed
25cc29d

Commits on Jun 20, 2026

Merge branch 'master' into develop
shanmukhkalasamudram
committed
9ff74b6