summaryrefslogtreecommitdiff
path: root/changelog.d/deprecate-scrobbles.remove
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2024-01-21 12:03:29 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2024-01-21 12:03:29 +0000
commitab3f03a04a34f2e267bef649ea7d055df583e43e (patch)
tree41c555d32f0805a45f553ae348b9bf42158e9426 /changelog.d/deprecate-scrobbles.remove
parenta5f64ffd0cba5e183744cf46506656ba61d36eda (diff)
parent548434f85ccaa4a77c460fb5bda37153ea6e9c39 (diff)
downloadpleroma-ab3f03a04a34f2e267bef649ea7d055df583e43e.tar.gz
pleroma-ab3f03a04a34f2e267bef649ea7d055df583e43e.zip
Merge branch 'develop' into 'public-polls'
# Conflicts: # docs/development/API/differences_in_mastoapi_responses.md
Diffstat (limited to 'changelog.d/deprecate-scrobbles.remove')
-rw-r--r--changelog.d/deprecate-scrobbles.remove1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/deprecate-scrobbles.remove b/changelog.d/deprecate-scrobbles.remove
deleted file mode 100644
index c453a9784..000000000
--- a/changelog.d/deprecate-scrobbles.remove
+++ /dev/null
@@ -1 +0,0 @@
-Deprecate Pleroma's audio scrobbling