Skip to content

merge upstream for 2024.2.1

dakkar requested to merge merge/2024-02-29 into develop

What does this PR do?

I've merged https://github.com/misskey-dev/misskey/pull/13447/ and made some minor adjustments (re-generated pnpm-lock.yaml (maybe even correctly, by pnpm install --no-frozen-lockfile), aligned NoteEditService and notes/edit.ts with their "create" counterparts, added missing English translations).

I expect the PR upstream to receive more commits before getting merged, I'll merge again when that happens.

This is my first big merge, so please pay extra attention! I may have broken things! (It builds, it seems to run, I can post and edit, notifications look fine, but still!)

Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines

  • I agree to follow this project's Contribution Guidelines
  • I have made sure to test this pull request

Merge request reports