From b904f5fa94fd580a585e16685bf2f21650a44db4 Mon Sep 17 00:00:00 2001 From: Alan Poulain Date: Fri, 10 Feb 2023 14:35:38 +0100 Subject: [PATCH] fix: security fixes are integrated into 2.7 too --- extra/releases.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/releases.md b/extra/releases.md index 49040010dd6..1c78a45d218 100644 --- a/extra/releases.md +++ b/extra/releases.md @@ -16,10 +16,10 @@ For example: 3 versions are maintained at the same time: * **stable** (currently the **3.1** branch): regular bugfixes are integrated in this version -* **old-stable** (currently **3.0** branch): [security fixes](security.md) are integrated in this version, regular bugfixes are **not** backported in it +* **old-stable** (currently **3.0** and **2.7** branches): [security fixes](security.md) are integrated in this version, regular bugfixes are **not** backported in it * **development** (**main** branch): new features target this branch -Older versions (1.x, 2.7...) **are not maintained**. If you still use them, you must upgrade as soon as possible. +Older versions (1.x, 2.6...) **are not maintained**. If you still use them, you must upgrade as soon as possible. The **old-stable** branch is merged in the **stable** branch on a regular basis to propagate [security fixes](security.md). The **stable** branch is merged in the **development** branch on a regular basis to propagate [security](security.md) and regular bugfixes.