Ajout de la prise en charge des photos de profil

2026-04-30 13:28:57 +02:00
parent cb4470e481
commit 7b3ba53e97
265 changed files with 42067 additions and 59 deletions
--- a/gestion_conge/migrations/0001_initial.py
+++ b/gestion_conge/migrations/0001_initial.py
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Generated by Django 5.2.13 on 2026-06-16 11:06
+=======
+# Generated by Django 5.2.13 on 2026-04-17 12:03
+>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)

 import django.db.models.deletion
 from django.db import migrations, models
--- a/gestion_conge/migrations/init.py
+++ b/gestion_conge/migrations/init.py