diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-14 16:08:53 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-14 16:08:53 +0000 |
| commit | 8b39d6f93cc6f9aecc76d67a686087366c3c50fd (patch) | |
| tree | 39e31c70233a4702b479666dd1fcf23c1b5f19ba /CHANGELOG.md | |
| parent | e3b4a3e96b2ffbc6d920155cd41687414045d4d6 (diff) | |
| parent | 17b8896c40fa1c4aaab96f82fd07d5f5f2698400 (diff) | |
| download | pleroma-8b39d6f93cc6f9aecc76d67a686087366c3c50fd.tar.gz pleroma-8b39d6f93cc6f9aecc76d67a686087366c3c50fd.zip | |
Merge branch 'master-to-stable' into 'develop'
Preparations for renaming `master` to `stable`
See merge request pleroma/pleroma!1840
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index bd06ec866..a9f124a8a 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/). - Report emails now include functional links to profiles of remote user accounts ## [1.1.0] - 2019-??-?? +**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` |