Resolve conflicts (#2401)

Co-authored-by: ibrahimjaved12 <[email protected]>
mitodl · Jan 28, 2025 · 3098c96 · 3098c96
1 parent e138477
commit 3098c96
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 38 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,7 +12,7 @@ python = "3.12.5"
 beautifulsoup4 = "^4.12.2"
 boto3 = "1.36.3"
 celery = "^5.3.0"
-cryptography = "^43.0.0"
+cryptography = "^44.0.0"
 dj-database-url = "2.2.0"
 django = "4.2.18"
 django-anymail = {version = "10.3", extras = ["mailgun"]}