Merge remote-tracking branch 'refs/remotes/misskey-original/develop' …

…into develop # Conflicts: # package.json
prismisskey · May 31, 2024 · 176e1f9 · 176e1f9
2 parents 249ac30 + ecf7945
commit 176e1f9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Unreleased
+
+### General
+-
+
+### Client
+-
+
+### Server
+-
+
+
 ## 2024.5.0
 
 ### Note

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.5.0-rc.13-mattyatea1",
+	"version": "2024.5.0-mattyatea1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.5.0-rc.13",
+	"version": "2024.5.0",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",