28 lines
356 B
Plaintext
28 lines
356 B
Plaintext
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
__pycache__/
|
|
*.pyc
|
|
=======
|
|
<<<<<<< HEAD
|
|
>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
|
|
db.sqlite3
|
|
venv/*
|
|
media/*
|
|
*.pyc
|
|
__pycache__/
|
|
=======
|
|
# db.sqlite3
|
|
# venv/*
|
|
# media/*
|
|
|
|
__pycache__/
|
|
*.pyc
|
|
|
|
=======
|
|
>>>>>>> 34a261a (Prise en charge de la photo de profil)
|
|
db.sqlite3
|
|
venv/
|
|
media/
|
|
staticfiles/
|
|
.env
|
|
migrations/ |