Merge branch 'main' of github.com:cak/hackertracker-web · junctor/hackertracker-web@d1d5cd8 · GitHub

Commit

Merge branch 'main' of github.com:cak/hackertracker-web

Browse files

# Conflicts:
#	docs/ht/colors.json
#	docs/ht/conferences/BSIDESNOVA2024/events.json
#	docs/ht/conferences/BSIDESNOVA2024/speakers.json
#	docs/ht/index.json

Loading branch information

cak committed Aug 29, 2024

2 parents 069b10c + dc78607 commit d1d5cd8