Merge branch 'master' into develop

felliott · felliott · commit 745cb3c3d2b3 · 2026-02-26T14:37:44.000-05:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,11 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.4.0 (2026-02-26)
+===================
+
+- Transition funder ids from CrossRef to ROR
+
 26.3.0 (2026-02-24)
 ===================
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "OSF",
-  "version": "26.3.0",
+  "version": "26.4.0",
   "description": "Facilitating Open Science",
   "repository": "https://github.com/CenterForOpenScience/osf.io",
   "author": "Center for Open Science",
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "osf-io"
-version = "24.05.2"
+version = "26.4.0"
 description = "The code for [https://osf.io](https://osf.io)."
 authors = ["Your Name <you@example.com>"]
 license = "Apache License 2.0"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "OSF",`
`3`		`- "version": "26.3.0",`
	`3`	`+ "version": "26.4.0",`
`4`	`4`	`"description": "Facilitating Open Science",`
`5`	`5`	`"repository": "https://github.com/CenterForOpenScience/osf.io",`
`6`	`6`	`"author": "Center for Open Science",`