summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-06-02 09:10:28 +0000
committerCan Eldem <celdem@gitlab.com>2020-06-02 09:10:28 +0000
commita49e935ee3e2e07d90da7c78b543a5592a3b1a4a (patch)
tree960dbaa58768be8e1e05dc098743d560ee3ec4c8 /CHANGELOG.md
parent0b976fcffe0a9b8e80587adb076bcdf279c9331c (diff)
parent16b452b82b08ecaeef1dde3c1cb6fd2ab0446947 (diff)
Merge branch '212919-pull-custom-conan-packages' into 'master'v3.11.0
Allow custom conan configuration See merge request gitlab-org/security-products/license-management!159
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a77e58..4a0a129 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# GitLab License management changelog
+## v3.11.0
+
+- Add support for providing custom [Conan](https://conan.io/) configuration. (!159)
+
## v3.10.0
- Add initial support for the [Conan](https://conan.io/) package manger. (!156)