fix: merge conflicts resolved
This commit is contained in:
commit
3eb819c4ae
17 changed files with 312 additions and 242 deletions
|
|
@ -1,6 +1,6 @@
|
|||
# base requirements
|
||||
|
||||
Django==4.2.7
|
||||
Django==4.2.10
|
||||
psycopg==3.1.12
|
||||
djangorestframework==3.14.0
|
||||
redis==4.6.0
|
||||
|
|
@ -30,7 +30,7 @@ openpyxl==3.1.2
|
|||
beautifulsoup4==4.12.2
|
||||
dj-database-url==2.1.0
|
||||
posthog==3.0.2
|
||||
cryptography==41.0.6
|
||||
cryptography==42.0.0
|
||||
lxml==4.9.3
|
||||
boto3==1.28.40
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue