Skip to content
Commit 7d0aaebb authored by Paul Khlopkov's avatar Paul Khlopkov 🏀
Browse files

Merge remote-tracking branch 'origin/axemanofic'

# Conflicts:
#	backend/.gitignore
#	backend/Dockerfile
#	backend/README.md
#	backend/pyproject.toml
#	backend/requirements.txt
#	backend/src/config/settings.py
#	backend/src/config/urls.py
parents 09ba63db 78ba5363
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment