tusooa ad45b06b3f Merge branch 'stable' into 'release/2.6.0' ... # Conflicts: # .gitlab-ci.yml # lib/pleroma/web/common_api/utils.ex # lib/pleroma/web/xml.ex # mix.exs # test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs # test/pleroma/web/common_api/utils_test.exs # test/pleroma/web/mastodon_api/update_credentials_test.exs # test/pleroma/web/xml_test.exs		2023-10-31 01:07:43 +00:00
..
akkoma-xml-remote-entities.security	Bump version to 2.6.0	2023-10-24 19:57:31 -04:00
check-attachment-attribution.security	Bump version to 2.6.0	2023-10-24 19:57:31 -04:00
emoji-pack-sanitization.security	Bump version to 2.6.0	2023-10-24 19:57:31 -04:00
otp_perms.security	Bump version to 2.6.0	2023-10-24 19:57:31 -04:00