summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-10-14 18:42:30 +0300
committerrinpatch <rinpatch@sdf.org>2019-10-14 18:42:30 +0300
commitd1e969842d9f78c262504adc0a80b8025f46c6a9 (patch)
tree459c26bd61669f9acb9cacaff3f6bd3249121418
parent58fea88564c8dcece007a547b186965963e4dcb4 (diff)
downloadpleroma-d1e969842d9f78c262504adc0a80b8025f46c6a9.tar.gz
pleroma-d1e969842d9f78c262504adc0a80b8025f46c6a9.zip
Add a changelog entry for branch-moving
-rw-r--r--CHANGELOG.md1
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`