Skip to content

Commit 67a540c

Browse files
authored
Merge pull request #4307 from conan-io/release/2.22
Sync develop2 with release branch
2 parents 7ee1de5 + 7d9be0e commit 67a540c

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

changelog.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ Changelog
33

44
This page lists the changes made to Conan in each version, with links to each pull request for more details.
55

6+
2.22.2 (07-Nov-2025)
7+
--------------------
8+
9+
- Bugfix: Fix assert when finding compatible binaries of a package that exists in both contexts with different settings. `#19208 <https://github.com/conan-io/conan/pull/19208>`_
10+
611
2.22.1 (30-Oct-2025)
712
--------------------
813

conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
# The short X.Y version.
6969
version = "2.22"
7070
# The full version, including alpha/beta/rc tags.
71-
release = u'2.22.1'
71+
release = u'2.22.2'
7272

7373
dir_path = os.path.dirname(os.path.realpath(__file__))
7474
if not os.path.exists(os.path.join(dir_path, "versions.json")):

0 commit comments

Comments
 (0)