Merge remote-tracking branch 'misskey/develop' into develop

2022-08-07 22:45:03 -07:00 · 2022-08-07 22:45:03 -07:00 · 294e091604
parent a5541d1283 55220a31e8
commit 294e091604
2 changed files with 2 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -9,9 +9,7 @@
 You should also include the user name that made the change.
 -->

-## 12.x.x (unreleased)
-
-### Improvements
+## 12.118.1 (2022/08/08)

 ### Bugfixes
 - Client: can not show some setting pages @syuilo
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.0-calc",
+	"version": "12.118.1-calc.rc.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",