summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-08-01 16:37:04 +0000
committerkaniini <ariadne@dereferenced.org>2019-08-01 16:37:04 +0000
commit1fe092e03cab11a08e5a15d6bbaf0fd603ef4a00 (patch)
treeba7800a07cb3df8556c8d3200507dee11ad1029a /CHANGELOG.md
parent955985fe2c1fdc6bf26151d36e51771662f7ee60 (diff)
parent81412240e6e6ca60a7fcece5eff056722d868d2e (diff)
downloadpleroma-1fe092e03cab11a08e5a15d6bbaf0fd603ef4a00.tar.gz
pleroma-1fe092e03cab11a08e5a15d6bbaf0fd603ef4a00.zip
Merge branch 'fix/semver-violations' into 'develop'
Fix Invalid SemVer version generation See merge request pleroma/pleroma!1517
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd64b2259..6fdc432ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- ActivityPub S2S: sharedInbox usage has been mostly aligned with the rules in the AP specification.
- ActivityPub S2S: remote user deletions now work the same as local user deletions.
- Not being able to access the Mastodon FE login page on private instances
+- Invalid SemVer version generation, when the current branch does not have commits ahead of tag/checked out on a tag
### Added
- MRF: Support for priming the mediaproxy cache (`Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`)