Skip to content

Commit 924bf46

Browse files
authored
Merge branch 'dev' into dependabot/pip/dev/cryptography-48.0.0
2 parents 82d7d1a + 5244e7a commit 924bf46

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

requirements.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ django-environ==0.13.0
1212
django-filter==25.2
1313
django-imagekit==6.1.0
1414
django-multiselectfield==1.0.1
15-
django-polymorphic==4.11.2
15+
django-polymorphic==4.11.3
1616
django-crispy-forms==2.6
1717
django_extensions==4.1
1818
django-slack==5.19.0
@@ -30,8 +30,13 @@ lxml==6.1.0
3030
Markdown==3.10.2
3131
openpyxl==3.1.5
3232
Pillow==12.2.0 # required by django-imagekit
33+
<<<<<<< dependabot/pip/dev/cryptography-48.0.0
3334
psycopg[c]==3.3.3
3435
cryptography==48.0.0
36+
=======
37+
psycopg[c]==3.3.4
38+
cryptography==46.0.7
39+
>>>>>>> dev
3540
python-dateutil==2.9.0.post0
3641
redis==7.4.0
3742
requests==2.33.1
@@ -41,9 +46,9 @@ uWSGI==2.0.31
4146
vobject==0.9.9
4247
whitenoise==5.2.0
4348
titlecase==2.4.1
44-
social-auth-app-django==5.8.0
49+
social-auth-app-django==5.9.0
4550
social-auth-core==4.8.7
46-
gitpython==3.1.49
51+
gitpython==3.1.50
4752
python-gitlab==8.3.0
4853
cpe==1.3.1
4954
packageurl-python==0.17.6
@@ -59,7 +64,7 @@ django-fieldsignals==0.8.0
5964
hyperlink==21.0.0
6065
djangosaml2==1.12.0
6166
drf-spectacular==0.29.0
62-
drf-spectacular-sidecar==2026.4.14
67+
drf-spectacular-sidecar==2026.5.1
6368
django-ratelimit==4.1.0
6469
argon2-cffi==25.1.0
6570
blackduck==1.1.3

0 commit comments

Comments
 (0)