korenstin 076d065ffa Merge branch 'main' into 'remove_picture' ... # Conflicts: # locale/fr/LC_MESSAGES/django.po		2024-07-18 17:52:22 +02:00
..
activity	charte info	2024-05-26 15:46:50 +02:00
api	Update 131 files	2024-02-07 02:26:49 +01:00
logs	Update 131 files	2024-02-07 02:26:49 +01:00
member	Merge branch 'main' into 'remove_picture'	2024-07-18 17:52:22 +02:00
note	modifications permissions consommation pc kfet (Alcool)	2024-06-24 16:57:39 +02:00
permission	oups la virgule oublié	2024-06-24 22:36:22 +02:00
registration	Fix #126 (join_bda)	2024-07-15 14:30:46 +02:00
scripts@f580f9b9e9	new commits in nk20-scripts	2023-07-17 06:58:01 +02:00
treasury	linters	2024-05-30 20:21:56 +02:00
wei	fix one copyright and a string before merge	2024-02-11 16:58:53 +01:00