aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-06-12 13:55:13 +0000
committerfeld <feld@feld.me>2020-06-12 13:55:13 +0000
commitebbf2189ee998c77d025823ab10d76443c17b9e9 (patch)
treee4fc7bef19cc3476dfdc02c86049897bfde7d58e
parent1419c67f4db0ae0c853600f98baf6dae829a4bd1 (diff)
parentc2048f75cd09696e30b443423cae4ba6ef3e593b (diff)
downloadpleroma-ebbf2189ee998c77d025823ab10d76443c17b9e9.tar.gz
Merge branch 'chore/bump-changelog' into 'develop'
Add changelog entry for emoji pack reload command See merge request pleroma/pleroma!2646
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cf2210f5..b19cae8b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Mastodon API: Add support for filtering replies in public and home timelines
- Admin API: endpoints for create/update/delete OAuth Apps.
- Admin API: endpoint for status view.
+- OTP: Add command to reload emoji packs
</details>
### Fixed