e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

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

Browse source
This commit is contained in:
ThatOneCalculator 2022-08-07 22:45:03 -07:00
parent a5541d1283 55220a31e8
commit 294e091604
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -9,9 +9,7 @@
You should also include the user name that made the change. You should also include the user name that made the change.
--> -->
## 12.x.x (unreleased) ## 12.118.1 (2022/08/08)
### Improvements
### Bugfixes ### Bugfixes
- Client: can not show some setting pages @syuilo - Client: can not show some setting pages @syuilo

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "12.118.0-calc", "version": "12.118.1-calc.rc.1",
"codename": "aqua", "codename": "aqua",
"repository": { "repository": {
"type": "git", "type": "git",