diff options
| author | lain <lain@soykaf.club> | 2020-07-21 22:18:02 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-21 22:18:02 +0000 |
| commit | c36113cdf5865cbccbd1da2f7404454134139e43 (patch) | |
| tree | 99d52ee68fdaef14d5fc3e63ec90e6f241ea56c5 /CHANGELOG.md | |
| parent | 2b5d9eb10529325aef1b4aab980bd901ba6b0c70 (diff) | |
| parent | 696c13ce54aff25737f8f753a94747d79b9c54b0 (diff) | |
| download | pleroma-c36113cdf5865cbccbd1da2f7404454134139e43.tar.gz pleroma-c36113cdf5865cbccbd1da2f7404454134139e43.zip | |
Merge branch 'revert-2b5d9eb1' into 'develop'
Revert "Merge branch 'linkify' into 'develop'"
See merge request pleroma/pleroma!2784
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f4397ec3c..080270073 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - **Breaking:** Elixir >=1.9 is now required (was >= 1.8) -- **Breaking:** Configuration: `:auto_linker, :opts` moved to `:pleroma, Pleroma.Formatter`. Old config namespace is deprecated. - In Conversations, return only direct messages as `last_status` - Using the `only_media` filter on timelines will now exclude reblog media - MFR policy to set global expiration for all local Create activities |