Skip to content

Commit

Permalink
Merge branch '3.4' into 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dunglas committed Sep 26, 2024
2 parents bb842a5 + 1fbfa67 commit 317ae07
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions extra/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ For example:

3 versions are maintained at the same time:

* **stable** (currently the **3.2** branch): regular bugfixes are integrated in this version
* **old-stable** (are the last 2 minor branches: currently **3.0** and **3.1** branches): [security fixes](security.md) are integrated in this version, regular bugfixes are **not** backported in it
* **stable** (currently the **4.0** branch): regular bugfixes are integrated in this version
* **old-stable** (are the last 2 minor branches: currently **3.4** and **3.3** 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.6...) **are not maintained**. If you still use them, you must upgrade as soon as possible.
Expand Down

0 comments on commit 317ae07

Please sign in to comment.