10a495f783
creer un conflit
e0f5be3bc0
Merge branch 'master' of https://git.etud.insa-toulouse.fr/hamoud/tutClubInfo
Please note that blocking a user has other effects, such as: