summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-09-26 22:17:20 +0000
committerrinpatch <rinpatch@sdf.org>2019-09-26 22:17:20 +0000
commit67a659a096ecadc66eac1018d87516a149825c0a (patch)
tree1ca49d8b24a8e6576f8ec4068639f0bcf1934774
parentcb282f2ccde11f877213988e288f4ba9578d0aed (diff)
parent3ec81b816f436cf37efd6a133f02b49d84501b59 (diff)
downloadpleroma-67a659a096ecadc66eac1018d87516a149825c0a.tar.gz
pleroma-67a659a096ecadc66eac1018d87516a149825c0a.zip
Merge branch 'chore/changelog-sync' into 'develop'
Sync changelogs between master and develop See merge request pleroma/pleroma!1724
-rw-r--r--CHANGELOG.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9ddb5b03..755b28d5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,7 +45,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Improve digest email template
– Pagination: (optional) return `total` alongside with `items` when paginating
- Add `rel="ugc"` to all links in statuses, to prevent SEO spam
-- ActivityPub: The first page in inboxes/outboxes is no longer embedded.
### Fixed
- Following from Osada
@@ -119,6 +118,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- RichMedia: parsers and their order are configured in `rich_media` config.
- RichMedia: add the rich media ttl based on image expiration time.
+## [1.0.7] - 2019-09-26
+### Fixed
+- Broken federation on Erlang 22 (previous versions of hackney http client were using an option that got deprecated)
+### Changed
+- ActivityPub: The first page in inboxes/outboxes is no longer embedded.
+
## [1.0.6] - 2019-08-14
### Fixed
- MRF: fix use of unserializable keyword lists in describe() implementations