From aa30743f43b2ba3f22f98dfd649cdefe6f2b1945 Mon Sep 17 00:00:00 2001 From: naskya Date: Wed, 10 Jul 2024 10:21:33 +0900 Subject: [PATCH] docs: fix merge --- docs/api-change.md | 2 +- docs/notice-for-admins.md | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/api-change.md b/docs/api-change.md index 8e7ab87547..20f87e9f82 100644 --- a/docs/api-change.md +++ b/docs/api-change.md @@ -2,7 +2,7 @@ Breaking changes are indicated by the :warning: icon. -## v20240710 +## Unreleased - 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. diff --git a/docs/notice-for-admins.md b/docs/notice-for-admins.md index 6cc68ca337..2186e63f38 100644 --- a/docs/notice-for-admins.md +++ b/docs/notice-for-admins.md @@ -6,6 +6,16 @@ You can skip intermediate versions when upgrading from an old version, but pleas 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 ### For all users @@ -23,14 +33,6 @@ The new versions are: [Node v21.x is end-of-life](). -### 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 The following environment variables are deprecated and no longer have any effect: