docs: fix merge
This commit is contained in:
parent
f6c633b6c4
commit
aa30743f43
2 changed files with 11 additions and 9 deletions
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Breaking changes are indicated by the :warning: icon.
|
Breaking changes are indicated by the :warning: icon.
|
||||||
|
|
||||||
## v20240710
|
## Unreleased
|
||||||
|
|
||||||
- Added `readCatLanguage` field to the response of `i` and request of `i/update` (optional).
|
- Added `readCatLanguage` field to the response of `i` and request of `i/update` (optional).
|
||||||
- The old Mastodon API has been replaced with a new implementation based on Iceshrimp’s.
|
- The old Mastodon API has been replaced with a new implementation based on Iceshrimp’s.
|
||||||
|
|
|
@ -6,6 +6,16 @@ You can skip intermediate versions when upgrading from an old version, but pleas
|
||||||
|
|
||||||
Please take a look at #10947.
|
Please take a look at #10947.
|
||||||
|
|
||||||
|
## Unreleased
|
||||||
|
|
||||||
|
### For systemd/pm2 users
|
||||||
|
|
||||||
|
You can remove the `packages/megalodon` directory after pulling the latest source code (`git pull --ff origin main`).
|
||||||
|
|
||||||
|
```sh
|
||||||
|
rm --recursive --force packages/megalodon
|
||||||
|
```
|
||||||
|
|
||||||
## v20240710
|
## v20240710
|
||||||
|
|
||||||
### For all users
|
### For all users
|
||||||
|
@ -23,14 +33,6 @@ The new versions are:
|
||||||
|
|
||||||
[Node v21.x is end-of-life](<https://github.com/nodejs/Release?tab=readme-ov-file#end-of-life-releases>).
|
[Node v21.x is end-of-life](<https://github.com/nodejs/Release?tab=readme-ov-file#end-of-life-releases>).
|
||||||
|
|
||||||
### For systemd/pm2 users
|
|
||||||
|
|
||||||
You can remove the `packages/megalodon` directory after pulling the latest source code (`git pull --ff origin main`).
|
|
||||||
|
|
||||||
```sh
|
|
||||||
rm --recursive --force packages/megalodon
|
|
||||||
```
|
|
||||||
|
|
||||||
## v20240607
|
## v20240607
|
||||||
|
|
||||||
The following environment variables are deprecated and no longer have any effect:
|
The following environment variables are deprecated and no longer have any effect:
|
||||||
|
|
Loading…
Reference in a new issue