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
Showing
- CHANGELOG.md 16 additions, 0 deletionsCHANGELOG.md
- changelog.d/akkoma-xml-remote-entities.security 1 addition, 0 deletionschangelog.d/akkoma-xml-remote-entities.security
- changelog.d/check-attachment-attribution.security 1 addition, 0 deletionschangelog.d/check-attachment-attribution.security
- changelog.d/emoji-pack-sanitization.security 1 addition, 0 deletionschangelog.d/emoji-pack-sanitization.security
- changelog.d/otp_perms.security 1 addition, 0 deletionschangelog.d/otp_perms.security
Loading
Please register or sign in to comment