diff options
| author | tusooa <tusooa@kazv.moe> | 2023-10-31 01:07:43 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2023-10-31 01:07:43 +0000 |
| commit | ad45b06b3f1d7dd4157a3fbc44dc1d2f07c98f35 (patch) | |
| tree | ec8b787417a236aca411f0697465caf51d2b61ed /README.md | |
| parent | ab894d98f4be5aadc033b71dacc499b85b579bc1 (diff) | |
| parent | f966abe4fbacf8fa91cf2b533f8abfb57d62f8b7 (diff) | |
| download | pleroma-ad45b06b3f1d7dd4157a3fbc44dc1d2f07c98f35.tar.gz pleroma-ad45b06b3f1d7dd4157a3fbc44dc1d2f07c98f35.zip | |
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
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions