Skip to content
Blame History Permalink
  • tusooa's avatar
    Merge branch 'stable' into 'release/2.6.0' · ad45b06b
    tusooa authored 
    # 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
    ad45b06b
To find the state of this project's repository at the time of any of these versions, check out the tags.