Merge branch 'master' into 'develop'

Mergeback master into develop

See merge request pleroma/pleroma-fe!2199

CHANGELOG.md

@@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2.10.1
+### Fixed
+- fixed being unable to set actor type from profile page
+- fixed error when clicking mute menu itself (instead of submenu items)
+- fixed mute -> domain status submenu not working
+
+### Internal
+- Add playwright E2E-tests with an optional docker-based backend
+
 ## 2.10.0
 ### Changed
 - Temporary changes modal now shows actual countdown instead of fixed timeout

changelog.d/actor-type.fix

@@ -1 +0,0 @@
-fixed being unable to set actor type from profile page

changelog.d/e2e-tests.add

@@ -1 +0,0 @@
-Add playwright E2E-tests with an optional docker-based backend

changelog.d/e2e.skip

@@ -1 +0,0 @@
-fix e2e

changelog.d/error-mute.fix

@@ -1 +0,0 @@
-fixed error when clicking mute menu itself (instead of submenu items)

changelog.d/mute-domain.fix

@@ -1 +0,0 @@
-fixed mute -> domain status submenu not working

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "Pleroma frontend, the default frontend of Pleroma social network server",
   "author": "Pleroma contributors <https://git.pleroma.social/pleroma/pleroma-fe/-/blob/develop/CONTRIBUTORS.md>",
   "private": false,