diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-14 18:42:30 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-14 19:34:29 +0300 |
| commit | 164f42c5f834313a7796fa479eda33e1ad8861c7 (patch) | |
| tree | be222ecf5d18a7b91d943484bb55bc9850d44971 | |
| parent | bbe409c914c413fd8e218b2b2ea64523c0ec9b43 (diff) | |
| download | pleroma-164f42c5f834313a7796fa479eda33e1ad8861c7.tar.gz | |
Add a changelog entry for branch-moving
| -rw-r--r-- | CHANGELOG.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 52d127b62..ee43734e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Report emails now include functional links to profiles of remote user accounts - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`) +<<<<<<< HEAD ### Removed - ActivityPub: The `/objects/:uuid/likes` endpoint. @@ -29,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - The `Pleroma.FlakeId` module has been replaced with the `flake_id` library. ## [1.0.90] - 2019-09-30 +**Breaking:** The stable branch has been changed from `master` to `stable`, `master` now points to `release/1.0` ### Security - Mastodon API: respect post privacy in `/api/v1/statuses/:id/{favourited,reblogged}_by` |