From f8436f53719aa835feaff815d3e46550ff70866e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 1 Mar 2021 13:07:42 +0100
Subject: [PATCH] Bumped minimum Conan to 1.33.0
---
ThirdParty/container-maker | 2 +-
web/data/versions.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index 35d81f1b2fa..dddaa761c9c 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit 35d81f1b2fa2470035eb578364e4b867dc41aa8e
+Subproject commit dddaa761c9c20ec3bd79995a722e20ad15c40edb
diff --git a/web/data/versions.json b/web/data/versions.json
index 51e4de5824d..0dffb933ddf 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -9,7 +9,7 @@
"toolset": "142",
"compiler": "19.24"
},
- "conan": "1.32.1",
+ "conan": "1.33.0",
"git": "2.14",
"cmake": "3.14",
"hugo": "0.64.1",
--
GitLab