Skip to content
Snippets Groups Projects
Commit 900fd114 authored by Troy's avatar Troy
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	backend/db.sqlite3
#	frontend/src/index.js
parents 021ec13b 6306bed9
No related branches found
No related tags found
No related merge requests found
...@@ -9,3 +9,5 @@ sqlparse==0.4.4 ...@@ -9,3 +9,5 @@ sqlparse==0.4.4
typing_extensions==4.9.0 typing_extensions==4.9.0
tzdata==2023.4 tzdata==2023.4
requests==2.26.0 requests==2.26.0
django-truncate
shodan
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment