fix master/develop merge conflicts

See merge request !1712

* master:
  fix changelog entries in wrong places
  changelog date
  set changelog version
  rc 2.2.3
  mark unreleased as 2.2.2 in changelog
  set patch date to correct
  update changelog for 2.2.0
  update changelog for 2.1.2
  update changelog with 2.1.1
  fix boomarks mistake in changelog
  add missing release to changelog to fix conflicts
  add back unreleased/patch
  set 2.1.0 date and remove rc from changelog
  change changelog
  update changelog for 2.0.5
  Revert "remove with_move param"

Update CHANGELOG.md

See merge request !1710

Preparing for 2.5.0 release

See merge request !1709

higher up in list and less important is at the bottom, changed
unreleased to 2.5.0

Fix rogue nested watcher triggering notifications registering too often

Closes #1159

See merge request !1708

User note

See merge request !1612

add icon to allow expand collapsed (status-related) notifications

Closes #1224

See merge request !1701

Fix interactions tab null dereference

See merge request !1707

fix passwords not being detected as same

Closes #1228

See merge request !1706

more resistant code for color parsing error

See merge request !1702

Normalize tusooa's name

See merge request !1700

Update dependency eslint-plugin-n to v15.6.0

See merge request !1682

I don't have a last name and that part is solely to pass some arbitrary
name filter on some badly-implemented forge.

fix private mode & timelines dropdown

Closes #1220

See merge request !1696

Translations update from Pleroma Weblate

See merge request !1684

Currently translated at 96.7% (885 of 915 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/

Currently translated at 99.5% (911 of 915 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/

Currently translated at 97.3% (891 of 915 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/